OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Wed, 30 Jan 2013 16:47:43 +0000 (17:47 +0100)
committerNathanSweet <nathan.sweet@gmail.com>
Wed, 30 Jan 2013 16:47:43 +0000 (17:47 +0100)

Trivial merge