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)

Trivial merge