OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Mon, 15 Apr 2013 17:11:28 +0000 (19:11 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Mon, 15 Apr 2013 17:11:28 +0000 (19:11 +0200)

Trivial merge