Christopher Allan Webber d33a954cad Merge remote-tracking branch 'refs/remotes/rodney757/new_ldap' ...

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

2013-09-20 07:32:52 -05:00

2.4 KiB

Raw Blame History

View Raw