From: Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Date: Sun, 6 Nov 2011 21:13:52 +0000 (+0200)
Subject: Merge branch 'dev' into gh_master
X-Git-Tag: v1.2.0pre~75^2^2~5
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8170da06a6eb55bfe02fa9e3541b89e5a44ae4a4;p=wvm%2Fgitlab.git

Merge branch 'dev' into gh_master
---

8170da06a6eb55bfe02fa9e3541b89e5a44ae4a4