From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Sat, 21 Jan 2012 10:17:43 +0000 (+0100)
Subject: Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
X-Git-Tag: 0.1~1063^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=08c272b93d29bfcc7160fb689fd54d47895f6ee4;p=fdroidserver.git

Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Conflicts:
	wp-fdroid/wp-fdroid.php
---

08c272b93d29bfcc7160fb689fd54d47895f6ee4