[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 6a3ac2affe68ab0c9a27264050aa3b731ae83f21

[Marc Delisle]

The branch, master has been updated
       via  6a3ac2affe68ab0c9a27264050aa3b731ae83f21 (commit)
      from  c00d602f1bd49a1bb387119cb5cc7ad37206beab (commit)


- Log -----------------------------------------------------------------
commit 6a3ac2affe68ab0c9a27264050aa3b731ae83f21
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Mar 18 08:13:36 2010 -0400

    about FOSDEM 2010 team meeting

-----------------------------------------------------------------------

Summary of changes:
 images/fosdem-2010/fosdem-2010-med.jpg |  Bin 0 -> 110216 bytes
 images/fosdem-2010/fosdem-2010-tn.jpg  |  Bin 0 -> 24510 bytes
 templates/team.tpl                     |   21 +++++++++++++++++----
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 images/fosdem-2010/fosdem-2010-med.jpg
 create mode 100644 images/fosdem-2010/fosdem-2010-tn.jpg

diff --git a/images/fosdem-2010/fosdem-2010-med.jpg b/images/fosdem-2010/fosdem-2010-med.jpg
new file mode 100644
index 0000000..f45d8d6
Binary files /dev/null and b/images/fosdem-2010/fosdem-2010-med.jpg differ
diff --git a/images/fosdem-2010/fosdem-2010-tn.jpg b/images/fosdem-2010/fosdem-2010-tn.jpg
new file mode 100644
index 0000000..c501735
Binary files /dev/null and b/images/fosdem-2010/fosdem-2010-tn.jpg differ
diff --git a/templates/team.tpl b/templates/team.tpl
index eeb1db5..beb36e9 100644
--- a/templates/team.tpl
+++ b/templates/team.tpl
@@ -80,10 +80,10 @@ He lives in <span class="adr"><span class="locality">Groningen</span>, <span cla
 <h2>Team meetings</h2>
 
 <p>
-We would like to meet other members of the team more often, but so far only a
-single team meeting in real life has happened. It was at big party in Karlsruhe,
-Germany for the 10th anniversary of PHP and MySQL at the 
-<a href="http://www.linuxtag.org/2005">LinuxTag</a>
+We would like to meet other members of the team more often; so far only two
+team meetings in real life have happened. The first one was at a big party 
+in Karlsruhe, Germany for the 10th anniversary of PHP and MySQL at the 
+<a href="http://www.linuxtag.org/2005">LinuxTag</a> 2005
 <a href="http://www.lamparea.org/">LAMP Area</a>, with some special
 guests.
 </p>
@@ -104,6 +104,19 @@ guests.
     </a>
 </div>
 
+<p>The second meeting took place in Brussels, Belgium during 
+<a href="http://fosdem.org/2010">FOSDEM 2010</a>. Marc Delisle talked
+about "State of phpMyAdmin" in the MySQL developer room.
+</p>
+
+<div class="screenshot">
+    <a href="${base_url}images/fosdem-2010/fosdem-2010-med.jpg"
+    rel="lightbox[meeting]" title="During lunch break - Marc Delisle, Robin H. Johnson, Herman van Rink, Michal Čihař, Alexander M. Turek">
+        <img src="${base_url}images/fosdem-2010/fosdem-2010-tn.jpg"
+        alt="phpMyAdmin team at FOSDEM 2010" />
+    </a>
+</div>
+
 <div class="clearer"></div>
 
 <h2>Contributors</h2>


hooks/post-receive
-- 
phpMyAdmin website