From: Andre Noll Date: Sat, 24 Dec 2011 17:30:07 +0000 (+0100) Subject: Merge remote-tracking branch 's/master' X-Git-Tag: v0.4.10~25 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=85094cd802bdb606d4e2bf7ed66dec51db2a0953;hp=a0013831ff918ac229066c9c804f75e1b50011c5 Merge remote-tracking branch 's/master' --- diff --git a/web/index.in.html b/web/index.in.html index 13039b59..7bb5d7ab 100644 --- a/web/index.in.html +++ b/web/index.in.html @@ -1,7 +1,7 @@

Events