OSDN Git Service

Merge branch 'wdoor-stable'
authorDaigo Moriwaki <daigo@debian.org>
Mon, 13 Oct 2014 09:43:25 +0000 (18:43 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Mon, 13 Oct 2014 09:43:25 +0000 (18:43 +0900)
commitb44ab891a52ed746631ff05a5f8b80eb4e5f24b1
tree78d287a3e0b1cca3e0e759b901ec99fbd08db4c5
parentd7b5e8dca433dd93287fc7979b6412dd947523ba
parentcc5500d77750ee924c1506a40b750059a25ad497
Merge branch 'wdoor-stable'

Conflicts:
changelog
changelog