OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Sat, 29 Sep 2012 04:03:36 +0000 (21:03 -0700)
committerNathanSweet <nathan.sweet@gmail.com>
Sat, 29 Sep 2012 04:03:36 +0000 (21:03 -0700)

Trivial merge