Merge branch 'master' into search
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 27 Aug 2012 12:20:35 +0000 (14:20 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 27 Aug 2012 12:20:35 +0000 (14:20 +0200)
commitb1fb752ca1abb051a63da4729e34a80affc25c76
tree01eba4bdf04c05352dcd41045407b2f5986b9e7b
parent9c8f0adb8bb6c8b86517798d70c2c8dcd198e721
parente8813ee4389a5e22df46d1973409d70a8e6706be
Merge branch 'master' into search

Conflicts:
prawokultury/settings.d/30-apps.conf
requirements.txt
prawokultury/settings.d/30-apps.conf
prawokultury/urls.py
requirements.txt