OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Tue, 28 May 2013 20:34:52 +0000 (22:34 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Tue, 28 May 2013 20:34:52 +0000 (22:34 +0200)

Trivial merge