From: gitlabhq <m@gitlabhq.com>
Date: Tue, 8 Nov 2011 17:26:28 +0000 (-0500)
Subject: Merge branch 'dev'
X-Git-Tag: v1.2.0pre~76^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=faa87e61bf87f1dcff1222573af0ac45679e4777;p=wvm%2Fgitlab.git

Merge branch 'dev'
---

faa87e61bf87f1dcff1222573af0ac45679e4777