Merge branch 'merge-pyconfigure'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 7 Aug 2013 16:57:12 +0000 (11:57 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Wed, 7 Aug 2013 16:57:12 +0000 (11:57 -0500)
commit24e6c34e880494f3e0cb2151db13ffcd128e1578
tree6b59a3e1f245a181abffdff108ca9f05c177db4f
parent31de493e4136f1c0c8e9d8f0b82c2914ea990c15
parent99d79749c44f3cb37faf4152762f9847292b7c0a
Merge branch 'merge-pyconfigure'

Conflicts:
docs/source/siteadmin/deploying.rst
docs/source/siteadmin/deploying.rst