From: Konrad Rosenbaum <konrad@silmor.de>
Date: Tue, 6 Dec 2011 19:38:00 +0000 (+0100)
Subject: Merge remote branch 'remotes/dptr-loc/master'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=dfe1342e50c307ef132e9f1a6ab34549da827c09;p=web%2Fkonrad%2Ftaurus.git

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

dfe1342e50c307ef132e9f1a6ab34549da827c09