Merge branch 'master' into travis-matrix
authormayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:54:16 +0000 (20:54 +0200)
committermayeut <mayeut@users.noreply.github.com>
Tue, 6 Oct 2015 18:54:16 +0000 (20:54 +0200)
commit26b2728c493d30c2ecc058e775cbc8c86c158e88
tree579390f019c513d7a4a35fb42ca56a0eb083ac44
parent987f96004f53c039dbcb72bcaeef940676d1368d
parente526d435cc874b97ae41eacc6b8b0b72419180fb
Merge branch 'master' into travis-matrix