Merge branch 'ir_templates'
authorSven Schöling <s.schoeling@linet-services.de>
Wed, 30 Dec 2009 15:26:04 +0000 (16:26 +0100)
committerSven Schöling <s.schoeling@linet-services.de>
Wed, 30 Dec 2009 15:26:04 +0000 (16:26 +0100)
commit9bd3030a376850c427c102c6e0c54f19bd19332e
tree9a55b56b474b23dd357ab9f0527c7c124e4990b3
parent4ee4b7ff5eac745c87b85004a1f63ff13e09f6c9
parent2dbb0236bbcc475e01701bd2794eac9f0cbc5ed5
Merge branch 'ir_templates'

Conflicts:
SL/OP.pm
SL/CP.pm
SL/IC.pm
SL/OE.pm
bin/mozilla/cp.pl
bin/mozilla/is.pl