Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
authorNiclas Zimmermann <niclas@lx-office-hosting.de>
Thu, 18 Oct 2012 12:28:21 +0000 (14:28 +0200)
committerNiclas Zimmermann <niclas@lx-office-hosting.de>
Thu, 18 Oct 2012 12:28:21 +0000 (14:28 +0200)
1  2 
bin/mozilla/ic.pl
templates/webpages/ic/search.html

Simple merge
Simple merge