OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Tue, 8 Oct 2013 22:08:16 +0000 (00:08 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Tue, 8 Oct 2013 22:08:16 +0000 (00:08 +0200)

Trivial merge