Merge branch 'master' of ssh://draghi.debian.org/~/userdir-ldap
authorLuca Filipozzi <lfilipoz@emyr.net>
Sat, 18 Jan 2014 01:16:59 +0000 (01:16 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Sat, 18 Jan 2014 01:16:59 +0000 (01:16 +0000)

Trivial merge