Merge branch 'hotfix/bug822832-django-1.4.3'
Merge branch 'release/2012-12-18'
Merge branch 'release/2013-01-07'
Merge branch 'master' of github.com:mozilla/elmo into develop
bug 842801 - Upgrade playdoh-lib for django 1.4.4, r=Pike