Merge branch 'master' of git://silmor.de/konrad/smoke
authorKonrad Rosenbaum <konrad@silmor.de>
Thu, 22 Dec 2011 12:14:06 +0000 (13:14 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Thu, 22 Dec 2011 12:14:06 +0000 (13:14 +0100)
commitd40c9f59ee65c0a31461010552df8412249bda4e
treee7ceb69188c74863e45a02a32bbdb31f48434360
parent0f52676b4b99577af1bd9f23a0d6d54e22766f85
parent8b1593fff3c059bdf863469644ce8cf0ec6a15f7
Merge branch 'master' of git://silmor.de/konrad/smoke