Merge branch 'master' of git://silmor.de/konrad/smoke
authorKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 12:06:29 +0000 (13:06 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Sat, 21 Nov 2015 12:06:29 +0000 (13:06 +0100)
commitfeb428a4e441052f1d6f4ccd607a5e24c721d5b8
treeeb01f44e202c320e1fd92bdc8635c40e46790eea
parent092d3e1117ad5d26bba4daa75032d38c3561c755
parent86b2d34dc5c932b70777834cd4e087dfee9fc1dc
Merge branch 'master' of git://silmor.de/konrad/smoke
magicsmoke.aurora