OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Tue, 17 Sep 2013 14:13:31 +0000 (16:13 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Tue, 17 Sep 2013 14:13:31 +0000 (16:13 +0200)

Trivial merge