From: Florian Forster <octo@verplant.org>
Date: Tue, 5 Jun 2012 15:05:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Url: https://git.tokkee.org/?p=collection4.git;a=commitdiff_plain;h=a7babc69db47718d5e0cc1af48bafaf8eea7c3d1

Merge remote-tracking branch 'github/master'
---

a7babc69db47718d5e0cc1af48bafaf8eea7c3d1