OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 2 Feb 2013 14:20:39 +0000 (15:20 +0100)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 2 Feb 2013 14:20:39 +0000 (15:20 +0100)

Trivial merge