mlitchard/authenticate-ldap — pull request #5 by axel-angel (2014-08-09 10:23:31+00:00)
Title: Merge conflicts of #3

This is #3 with the conflicts solved.