OSDN Git Service

Merge remote branch 'upstream/master' into vip-export-fixes
authorDaniel Bachhuber <d@danielbachhuber.com>
Wed, 7 Nov 2012 20:35:02 +0000 (20:35 +0000)
committerDaniel Bachhuber <d@danielbachhuber.com>
Wed, 7 Nov 2012 20:35:02 +0000 (20:35 +0000)

Trivial merge