From: Konrad Rosenbaum <konrad@silmor.de>
Date: Mon, 5 Dec 2011 20:56:21 +0000 (+0100)
Subject: Merge remote branch 'remotes/dptr-loc/master'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=0dd4e96ad9d081285b1402fe09d4281a29cf3bd1;p=web%2Fkonrad%2Fsmoke.git

Merge remote branch 'remotes/dptr-loc/master'
---

0dd4e96ad9d081285b1402fe09d4281a29cf3bd1