Merge 17ea77349f13470678cc2325e00d896a0da5d9a0 into d1296828410669e40d9941630eaadfd96... 14/merge
commit64d483e95a8426795194d0cb8ac6f2966867e96f
authorStefan Kögl <stefan@skoegl.net>
Sun, 6 Jan 2013 16:45:27 +0000 (6 08:45 -0800)
committerStefan Kögl <stefan@skoegl.net>
Sun, 6 Jan 2013 16:45:27 +0000 (6 08:45 -0800)
tree196e15e5d94f0148272355050a9f28b59f0a46fb
parentd1296828410669e40d9941630eaadfd96db7ea6d
parent17ea77349f13470678cc2325e00d896a0da5d9a0
Merge 17ea77349f13470678cc2325e00d896a0da5d9a0 into d1296828410669e40d9941630eaadfd96db7ea6d
mygpo/db/couchdb/podcast.py
mygpo/settings.py
requirements.txt