Merge branch 'django-1.5-compat' into deployments/scienceoffiction deployments/scienceoffiction
authorWill Thompson <will@willthompson.co.uk>
Thu, 25 Jul 2013 09:22:20 +0000 (10:22 +0100)
committerWill Thompson <will@willthompson.co.uk>
Thu, 25 Jul 2013 09:22:20 +0000 (10:22 +0100)
commit3ed4df9ab99a999126229d509ce24f0afd198208
tree6bb5eab28aeb49e5efa8fa46c2ad0ba097653dd3
parent9eb53df307e81ca5a06bfd79396d3be49e905ff0
parent24913a7f61d67477d482b9eef44698fa57dd6bca
Merge branch 'django-1.5-compat' into deployments/scienceoffiction