OSDN Git Service

Merge branch 'wdoor-stable'
authorDaigo Moriwaki <daigo@debian.org>
Sat, 17 Jan 2015 13:13:20 +0000 (22:13 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 17 Jan 2015 13:13:20 +0000 (22:13 +0900)
commit7845c4a03df15f57dc4a185765d45119245a2529
treeaf28b8aada266d5034b8486aac111a6f97f3a355
parent2df2951afe960f85d98b7b68311d17d231a27251
parentec11b3359a4258d7808036231f959463e8cb608e
Merge branch 'wdoor-stable'

Conflicts:
changelog
changelog