From: Daniel Martí <mvdan@mvdan.cc>
Date: Wed, 14 Aug 2013 10:03:19 +0000 (+0200)
Subject: Merge branch 'gradle' (finally!)
X-Git-Tag: 0.1~457
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2fdd274580c84b778698bfa0c45e47e6bee846e7;p=fdroidserver.git

Merge branch 'gradle' (finally!)

Conflicts:
	fdroidserver/checkupdates.py
---

2fdd274580c84b778698bfa0c45e47e6bee846e7