From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Fri, 7 Aug 2015 18:15:37 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 0.5.0~213
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c1598b04da1a1cde77f931d83d1dbc2543dc2956;p=fdroidserver.git

Merge branch 'master' into 'master'

Add configuration for pypi

See: [http://peterdowns.com/posts/first-time-with-pypi.html](http://peterdowns.com/posts/first-time-with-pypi.html)

See merge request !63
---

c1598b04da1a1cde77f931d83d1dbc2543dc2956