From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 12 Jul 2013 11:42:35 +0000 (+0300)
Subject: Merge branch 'master' into 6-0-dev
X-Git-Tag: v6.0.0~215^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=518181697041c5111bb42ca2bfdc119e258d425e;p=wvm%2Fgitlab.git

Merge branch 'master' into 6-0-dev
---

518181697041c5111bb42ca2bfdc119e258d425e