From: Tovok7 <Tovok7@gmx.de>
Date: Mon, 9 Jan 2012 23:33:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: 0.1~1080^2~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=acd81af93824fe6910d99c556510500e2f346ffd;p=fdroidserver.git

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

acd81af93824fe6910d99c556510500e2f346ffd