OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Mon, 14 Oct 2013 13:59:44 +0000 (15:59 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Mon, 14 Oct 2013 13:59:44 +0000 (15:59 +0200)

Trivial merge