Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Fri, 25 Sep 2015 20:27:56 +0000 (22:27 +0200)
committermayeut <mayeut@users.noreply.github.com>
Fri, 25 Sep 2015 20:27:56 +0000 (22:27 +0200)
commitf7dbcf15128e4beda0b5894e0b9f16dcc23cfbe6
tree2831740473e8eb4a01fa17fefe6a4e6472836b2e
parent09c35dcb84c56699318973a6cbc9eb31f64a0e18
parent838dfb8058df62af44905e1fa3936d989844effc
Merge branch 'master' into travis-matrix