From: Konrad Rosenbaum Date: Thu, 22 Dec 2011 12:14:06 +0000 (+0100) Subject: Merge branch 'master' of git://silmor.de/konrad/smoke X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=d40c9f59ee65c0a31461010552df8412249bda4e;p=web%2Fkonrad%2Fsmoke.git Merge branch 'master' of git://silmor.de/konrad/smoke --- d40c9f59ee65c0a31461010552df8412249bda4e