OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Thu, 30 May 2013 12:31:36 +0000 (14:31 +0200)
committerNathanSweet <nathan.sweet@gmail.com>
Thu, 30 May 2013 12:31:36 +0000 (14:31 +0200)

Trivial merge