Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 2 Jan 2014 20:49:04 +0000 (14:49 -0600)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 2 Jan 2014 20:49:04 +0000 (14:49 -0600)
commit408aa9cf3b29d778eb7594e4de1720a6bb158024
treee4bc99d15ad2a8190aaba5fbeb6f1568afbb827f
parentf4703ae9cdea5a2c5697444c0610dbee105f35dc
parent4a4e4e4ae83d6ff3f09580238049e74444b01416
Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support'

Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/tools/template.py
mediagoblin/templates/mediagoblin/base.html
mediagoblin/tools/template.py