From: Konrad Rosenbaum <konrad@silmor.de>
Date: Tue, 6 Dec 2011 06:53:33 +0000 (+0100)
Subject: Merge remote branch 'remotes/ziplib-loc/master'
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5492a77970da1ba3c1a499449d2bd9d0b52aea1e;p=web%2Fkonrad%2Fsmoke.git

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

5492a77970da1ba3c1a499449d2bd9d0b52aea1e