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

svn path=/branches/design/; revision=18963
This commit is contained in:
nicoulas
2010-12-22 13:58:53 +00:00
parent 7efec93d3e
commit ff99abff08
547 changed files with 15019 additions and 4203 deletions

View File

@@ -10,9 +10,9 @@
</head>
<body>
<div class="image right">
<img src="roy.jpg" alt="A photographic portrait" width="200" height="150" title="Hugo Roy" />
<img src="roy.png" alt="A photographic portrait by Bastian Blank" width="200" height="250" title="Hugo Roy" />
<p>
In front of the Berlin Wall, 11/2009
Mini Debian Conf, Paris, 10/2010
</p>
</div>
@@ -64,7 +64,7 @@
<li><a href="http://hugoroy.eu">Personal Website</a></li>
<li><a href="http://blogs.fsfe.org/hugo/">Fellowship Blog</a></li>
<li><a href="http://blog.hugoroy.eu">Personal Blog (in French)</a></li>
<li>Follow him on <a href="http://identi.ca/hugoroy">identi.ca</a> or <a href="http://twitter.com/HugoJRoy">Twitter</a></li>
<li>Follow him on <a href="http://identi.ca/royhugo">identi.ca</a> or <a href="http://twitter.com/RoyHugo">Twitter</a></li>
</ul>
</body>