OSDN Git Service

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

Trivial merge