From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 22 Nov 2012 10:52:08 +0000 (+0200)
Subject: Merge branch 'master' into stable
X-Git-Tag: v4.1.0~71^2~7
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Fheads%2F3-1-stable;p=wvm%2Fgitlab.git

Merge branch 'master' into stable

Conflicts:
	doc/install/installation.md
---

319f0c30573d1f2158adf52276981b2c7780392f