OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 15 Dec 2012 21:49:58 +0000 (21:49 +0000)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 15 Dec 2012 21:49:58 +0000 (21:49 +0000)

Trivial merge