]> xenbits.xensource.com Git - people/larsk/xenproject-org-websites.git/commitdiff
projects / people / larsk / xenproject-org-websites.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9717df 135745a)
Fixed merge conflict
authorlarsk <lars.kurth@citrix.com>
Tue, 21 May 2013 09:29:54 +0000 (10:29 +0100)
committerlarsk <lars.kurth@citrix.com>
Tue, 21 May 2013 09:29:54 +0000 (10:29 +0100)

Trivial merge
Contains custom html, skins and themes for Xen Project web real estate