From: Hans-Emil Skogh Date: Tue, 3 Jan 2012 20:16:30 +0000 (+0100) Subject: Merge remote branch 'origin/master' X-Git-Tag: 0.1~1063^2~13 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6806e2ff2205b2619c81697bafcd9d41766883f2;p=fdroidserver.git Merge remote branch 'origin/master' --- 6806e2ff2205b2619c81697bafcd9d41766883f2