From: larsk <lars.kurth@citrix.com>
Date: Tue, 21 May 2013 09:32:24 +0000 (+0100)
Subject: Merge branch 'master' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bfe1f32e5db7fa8f3bf5364c6b0fd359eba89f7b;p=people%2Flarsk%2Fxenproject-org-websites.git

Merge branch 'master' into staging
---

bfe1f32e5db7fa8f3bf5364c6b0fd359eba89f7b