OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Thu, 27 Sep 2012 08:43:29 +0000 (01:43 -0700)
committerNathanSweet <nathan.sweet@gmail.com>
Thu, 27 Sep 2012 08:43:29 +0000 (01:43 -0700)

Trivial merge