OSDN Git Service

Merge branch 'dev'
authorgitlabhq <m@gitlabhq.com>
Tue, 8 Nov 2011 17:26:28 +0000 (12:26 -0500)
committergitlabhq <m@gitlabhq.com>
Tue, 8 Nov 2011 17:26:28 +0000 (12:26 -0500)

Trivial merge