From: Konrad Rosenbaum Date: Sat, 17 Aug 2013 19:41:29 +0000 (+0200) Subject: Merge branch 'master' of git://silmor.de/konrad/smoke X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=092d3e1117ad5d26bba4daa75032d38c3561c755;p=web%2Fkonrad%2Fsmoke.git Merge branch 'master' of git://silmor.de/konrad/smoke --- 092d3e1117ad5d26bba4daa75032d38c3561c755