Merge branch 'Login-AfterForm-LDAP' into dev
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:12:40 +0000 (17:12 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:12:40 +0000 (17:12 +0200)

Trivial merge