Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 23 Jan 2016 08:37:26 +0000 (09:37 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 23 Jan 2016 08:37:26 +0000 (09:37 +0100)
commitfd54fd5bb9a34842da3a15f4841590b4ff9b2d71
treee41b79ad3413830bcd1b9ebf16cf4a8c8483e327
parent2c59be96101a0955b4c19f2609c61d91e25a0e65
parent51415b95420b1f63129f7a4c88ef48c35317fc12
Merge branch '2.0'
.travis.yml