OSDN Git Service

Merge branch 'ldap' into branch_r1_5
authorumorigu <umorigu@gmail.com>
Wed, 20 Jan 2016 20:56:45 +0000 (05:56 +0900)
committerumorigu <umorigu@gmail.com>
Wed, 20 Jan 2016 20:56:45 +0000 (05:56 +0900)

Trivial merge