Merge branch 'master' into travis-matrix 584/head
authormayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:14:38 +0000 (21:14 +0200)
committermayeut <mayeut@users.noreply.github.com>
Wed, 7 Oct 2015 19:14:38 +0000 (21:14 +0200)
commit5b6ff103bd0d18eeeae3a0e74b8fa9eb45d55a89
tree469ad8ecc6072cb1de9855eb6840ba937c1a6af8
parent26b2728c493d30c2ecc058e775cbc8c86c158e88
parentc86827952f68c52d082dc22704f7c786c037c3be
Merge branch 'master' into travis-matrix