OSDN Git Service

Merge remote-tracking branch 'origin/master'
authorNathanSweet <nathan.sweet@gmail.com>
Fri, 12 Oct 2012 01:54:08 +0000 (18:54 -0700)
committerNathanSweet <nathan.sweet@gmail.com>
Fri, 12 Oct 2012 01:54:08 +0000 (18:54 -0700)

Trivial merge