OSDN Git Service

Merge remote-tracking branch 'origin/wdoor-stable' into wdoor-stable
authorDaigo Moriwaki <daigo@debian.org>
Sat, 27 Dec 2014 14:32:58 +0000 (23:32 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sat, 27 Dec 2014 14:32:58 +0000 (23:32 +0900)
commit326856b66214cc6e2dccfb8f9121255148ca4a90
tree2416d83fb6e91c1546c4486ed099e621ef7097e9
parentddf702ed18fddb602dffa678ebb4c7109096aaf6
parentad33950bea1680fed0523fed7b71b439bed3f340
Merge remote-tracking branch 'origin/wdoor-stable' into wdoor-stable

Conflicts:
changelog
changelog