Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 Sep 2013 12:32:52 +0000 (07:32 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Fri, 20 Sep 2013 12:32:52 +0000 (07:32 -0500)
commitd33a954cad55457b52028f7ac57a59a07297c48a
tree3eadf7ee11518238545fdcbeaba0632efc7a1fc7
parent81008d25a2252e2747a571e35846885dc060d036
parentb1ac6795922bded7e8dbe8dcf769e57b410a4915
Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap'

Conflicts:
docs/source/index.rst
mediagoblin/templates/mediagoblin/auth/login.html
docs/source/index.rst