OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Fri, 4 Oct 2013 16:48:17 +0000 (18:48 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Fri, 4 Oct 2013 16:48:17 +0000 (18:48 +0200)

Trivial merge