OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Thu, 9 May 2013 00:27:49 +0000 (02:27 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Thu, 9 May 2013 00:27:49 +0000 (02:27 +0200)

Trivial merge