chiark / gitweb /
Merge branch 'master' into 'master'
authorHans-Christoph Steiner <hans@guardianproject.info>
Fri, 7 Aug 2015 18:15:37 +0000 (18:15 +0000)
committerHans-Christoph Steiner <hans@guardianproject.info>
Fri, 7 Aug 2015 18:15:37 +0000 (18:15 +0000)
commitc1598b04da1a1cde77f931d83d1dbc2543dc2956
tree052272582ff424697d15f862041adfc8c16ec6b5
parent9fc583289e8ce86c69a428f97067afac8098d194
parent09d686ebe736122ff798c5ac61f3bcabbdfc62ad
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