Merge branch 'master' of koha-dev.rot13.org:/srv/koha-bibliografija
authorDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 23 Jan 2014 11:00:54 +0000 (12:00 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Thu, 23 Jan 2014 11:00:54 +0000 (12:00 +0100)
1  2 
html.pl

diff --cc html.pl
Simple merge