OSDN Git Service

Merge branch 'master' into force-install-476
authorDaniel Bachhuber <d@danielbachhuber.com>
Tue, 2 Jul 2013 03:00:03 +0000 (20:00 -0700)
committerDaniel Bachhuber <d@danielbachhuber.com>
Tue, 2 Jul 2013 03:00:03 +0000 (20:00 -0700)

Trivial merge