Merge remote-tracking branch 'chiiph/bug/several_fixes' into develop
authorKali Kaneko <kali@futeisha.org>
Sun, 1 Sep 2013 22:03:14 +0000 (00:03 +0200)
committerKali Kaneko <kali@futeisha.org>
Sun, 1 Sep 2013 22:03:14 +0000 (00:03 +0200)
commitcd5e297c2abdb082c10161f256c286b8216de883
treed6001b34ad44ec5a365eb36525a89b769620ba7c
parent5ef6f1ae070ed7e5236aab119d7785f70e54b8e3
parent97d72aeda6ea094590069ba0d671c00404409d83
Merge remote-tracking branch 'chiiph/bug/several_fixes' into develop