Merge branch 'master' of git://silmor.de/konrad/smoke
authorKonrad Rosenbaum <konrad@silmor.de>
Sat, 11 Feb 2012 22:09:39 +0000 (23:09 +0100)
committerKonrad Rosenbaum <konrad@silmor.de>
Sat, 11 Feb 2012 22:09:39 +0000 (23:09 +0100)
commitf6c1d0a0a2780954698563e8198070e0f40fc6cc
treeb753d01e2c6ba4ae6e0d82fca7cbd7f1df9f7659
parent0b970e6deb38d2cbe7007a6238a17f186f670167
parent943175762a6d10becc8789cc6a9b72b821cf7713
Merge branch 'master' of git://silmor.de/konrad/smoke