]> xenbits.xensource.com Git - people/larsk/xenproject-org-websites.git/commitdiff
Merge branch 'master' into staging
authorlarsk <lars.kurth@citrix.com>
Tue, 16 Apr 2013 22:11:48 +0000 (23:11 +0100)
committerlarsk <lars.kurth@citrix.com>
Tue, 16 Apr 2013 22:11:48 +0000 (23:11 +0100)

Trivial merge