From: mpeshev <mario@peshev.net>
Date: Thu, 8 Aug 2013 13:34:51 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: v0.12.0~115^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=08466adb93269467f525dc30abffa7a92ee1f76f;p=wvm%2Fwvm.git

Merge remote-tracking branch 'upstream/master'
---

08466adb93269467f525dc30abffa7a92ee1f76f