OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Wed, 24 Oct 2012 23:42:58 +0000 (16:42 -0700)
committerNathanSweet <nathan.sweet@gmail.com>
Wed, 24 Oct 2012 23:42:58 +0000 (16:42 -0700)

Trivial merge