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)
commit894732a64582d3d48c768934f3828a3b58807f46
treeb45549a2f0b6801ea7347a8cc9a9d862f1c54ac3
parentb4d8bfa0dd853da90f0f3bf27879d42638c57405
parent248c5368a842fa9b6551cd87993e96e3f7829df8
Merge branch 'master' of ssh://draghi.debian.org/~/userdir-ldap