OSDN Git Service

Merge remote-tracking branch 'origin/master' into wdoor-stable
authorDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:25:14 +0000 (21:25 +0900)
committerDaigo Moriwaki <daigo@debian.org>
Sun, 13 Dec 2015 12:25:14 +0000 (21:25 +0900)
commitc363dd32f38189ade222b5cc730f830e6734c7c2
tree603d72288bfe954a056ac81fc2f3b79c7bf37920
parenteb5079160801fd1eb26f0c28a54e216a3afc9501
parente4a84fa22e0db1b48c9cd4efe62549895a1b7133
Merge remote-tracking branch 'origin/master' into wdoor-stable

Conflicts:
changelog
changelog