From: Javyer Der Derian <javier@tribalo.net>
Date: Mon, 20 Jan 2014 19:38:44 +0000 (-0800)
Subject: Merge pull request #2 from udacity/update_django
X-Git-Tag: live~28
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/31f67094578292b834139406a9aaea3a15123218

Merge pull request #2 from udacity/update_django

Migrate to Django 1.6
---

31f67094578292b834139406a9aaea3a15123218