OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Mon, 8 Apr 2013 06:17:36 +0000 (08:17 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Mon, 8 Apr 2013 06:17:36 +0000 (08:17 +0200)

Trivial merge