OSDN Git Service

Merge branch 'wdoor-stable'
authorDaigo Moriwaki <daigo@debian.org>
Mon, 12 Jan 2015 11:48:51 +0000 (20:48 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Mon, 12 Jan 2015 11:48:51 +0000 (20:48 +0900)
commit756e4372c5b0b439c2b1221ab27c8e763c2bfc6d
tree665376bd34f4db0edcc2e946b00bddf59d9dccad
parent069b2ad4140e12bd088250dbf0a45ff7a1186ed1
parent326856b66214cc6e2dccfb8f9121255148ca4a90
Merge branch 'wdoor-stable'

Conflicts:
changelog
changelog