From: Tovok7 <Tovok7@gmx.de>
Date: Sun, 15 Jan 2012 17:42:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.1~1080^2~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=815c66baae866d13f7b830359b1419f0fb2bab33;p=fdroidserver.git

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

815c66baae866d13f7b830359b1419f0fb2bab33