Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Wed, 23 Sep 2015 19:20:11 +0000 (21:20 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 23 Sep 2015 19:20:11 +0000 (21:20 +0200)
commit09c35dcb84c56699318973a6cbc9eb31f64a0e18
treef399e67c10a8412427dfd3799b708d24d9a550b0
parent3ea4486bedf15be988736e6f9cb5db088ea9017c
parentf82d7f3a63a99997449b15390d0c3f2fc6159d9c
Merge branch 'master' into travis-matrix