Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Sun, 13 Sep 2015 12:58:01 +0000 (14:58 +0200)
committermayeut <mayeut@users.noreply.github.com>
Sun, 13 Sep 2015 12:58:01 +0000 (14:58 +0200)
commit7d32f11a6fa31303aa737433fd364c5fbb72c2d7
tree5069ce01e8bdede7478b91ae1ef74bf69c65762a
parent3d295431e6c4e83528424d8ee3540072cd34d7ec
parentb4e8a425ae91e2e2bb66bdeba5628f7a7574084b
Merge branch 'master' into travis-matrix