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)
commitfaa87e61bf87f1dcff1222573af0ac45679e4777
treeb5d6f2fab261ffff74d920f02a0d6cfc506b3df0
parent0d4128bff1349466f65162218cd578bd7e2dfea5
parent49bced3a24ec81d782296def8a3e864e781ef9dd
Merge branch 'dev'