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

Merge remote-tracking branch 'upstream/master'

Conflicts:
	metadata/org.jmoyer.NotificationPlus.txt
---

a43734b169c24f87ed5f1192cead8273fbee10bf