OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Fri, 2 Nov 2012 21:12:20 +0000 (14:12 -0700)
committerNathanSweet <nathan.sweet@gmail.com>
Fri, 2 Nov 2012 21:12:20 +0000 (14:12 -0700)

Trivial merge