OSDN Git Service

Merge branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sun, 4 Aug 2013 19:20:10 +0000 (21:20 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Sun, 4 Aug 2013 19:20:10 +0000 (21:20 +0200)

Trivial merge