OSDN Git Service

Merge remote-tracking branch 'origin/wdoor-stable' into wdoor-stable
authorDaigo Moriwaki <daigo@debian.org>
Sat, 17 Jan 2015 13:12:04 +0000 (22:12 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 17 Jan 2015 13:12:04 +0000 (22:12 +0900)
commitec11b3359a4258d7808036231f959463e8cb608e
tree5b5b87963080d15f5727405f05a3831c393210b2
parent7c643a7ada1bfc2a938fe6bc3541f4cdd1e2aa96
parent326856b66214cc6e2dccfb8f9121255148ca4a90
Merge remote-tracking branch 'origin/wdoor-stable' into wdoor-stable

Conflicts:
changelog
changelog