Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:50:59 +0000 (21:50 +0200)
committermayeut <mayeut@users.noreply.github.com>
Mon, 5 Oct 2015 19:50:59 +0000 (21:50 +0200)
commit987f96004f53c039dbcb72bcaeef940676d1368d
tree88198103d0bf9632bbec67774e769c6b45707f25
parentf7dbcf15128e4beda0b5894e0b9f16dcc23cfbe6
parent0b6a592372d6360ec64b8d1364b6ee56a1dd2a5f
Merge branch 'master' into travis-matrix