OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 29 Dec 2012 13:37:08 +0000 (14:37 +0100)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 29 Dec 2012 13:37:08 +0000 (14:37 +0100)

Trivial merge