OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sun, 6 Oct 2013 11:08:55 +0000 (13:08 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Sun, 6 Oct 2013 11:08:55 +0000 (13:08 +0200)

Trivial merge