OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Wed, 2 Oct 2013 10:33:20 +0000 (12:33 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Wed, 2 Oct 2013 10:33:20 +0000 (12:33 +0200)

Trivial merge