Merge branch 'master' of hackdaworld.org:/chroot/git/lectures/latex
authorFrank Zirkelbach <f.zirkelbach@fkf.mpg.de>
Mon, 1 Jul 2013 07:42:37 +0000 (09:42 +0200)
committerFrank Zirkelbach <f.zirkelbach@fkf.mpg.de>
Mon, 1 Jul 2013 07:42:37 +0000 (09:42 +0200)
1  2 
bibdb/bibdb.bib

diff --cc bibdb/bibdb.bib
Simple merge