OSDN Git Service

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

Trivial merge