merged all updated data from trunk into design, at revision 18962. build works on my machine

svn path=/branches/design/; revision=18963
2010-12-22 13:58:53 +00:00
parent 7efec93d3e
commit ff99abff08
547 changed files with 15019 additions and 4203 deletions
--- a/about/greve/greve.en.xhtml
+++ b/about/greve/greve.en.xhtml
@@ -57,6 +57,14 @@
      CV.
    </p>

+    <h2>Honors and Awards</h2>
+
+    <p>On 18 December 2009 Georg Greve was awarded the Federal Cross
+    of Merit on ribbon by the Federal Republic of Germany for his
+    achievements in Free Software and Open Standards. The ceremony was
+    held May 2010 in the German embassy in Berne.
+    </p>
+
    <h2>Publications</h2>

    <p>