]> jspc29.x-matter.uni-frankfurt.de Git - conferences.git/commitdiff
Merge branch 'master' of jspc29:conferences
authorJan Michel <j.michel@gsi.de>
Mon, 22 Apr 2013 09:12:52 +0000 (11:12 +0200)
committerJan Michel <j.michel@gsi.de>
Mon, 22 Apr 2013 09:12:52 +0000 (11:12 +0200)

Trivial merge