OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sun, 29 Sep 2013 13:41:09 +0000 (15:41 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Sun, 29 Sep 2013 13:41:09 +0000 (15:41 +0200)

Trivial merge