OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 5 Oct 2013 17:54:48 +0000 (19:54 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 5 Oct 2013 17:54:48 +0000 (19:54 +0200)

Trivial merge