Merge remote-tracking branch 'github' into HEAD
commit99a2e788a3d051da250f4f3661fbc0e1aacbca44
authorMartin Panter <vadmium à gmail·com>
Sat, 16 May 2015 06:30:36 +0000 (16 06:30 +0000)
committerMartin Panter <vadmium à gmail·com>
Sat, 16 May 2015 06:30:36 +0000 (16 06:30 +0000)
tree6decf2814eeb876244f19c10372a1624072e3cbe
parent59e098df6d5cfa38fb894811c30685e17381a7bc
parent80f2d9a94a127860a0083d4870617801967b0219
Merge remote-tracking branch 'github' into HEAD