From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 3 Apr 2014 16:51:15 +0000 (+0000)
Subject:  Merge branch 'master' into 'master'
X-Git-Tag: 0.2~145
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9ccdd209acfbcf51bb633ddff7304431c8e0bc17;p=fdroidserver.git

 Merge branch 'master' into 'master'

build and test fixes

various fixes for the build process and tests
---

9ccdd209acfbcf51bb633ddff7304431c8e0bc17