# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1348758946 -7200
# Node ID 3f4bdea2abbf6e5226e7d029dca5adf1a6fd8acd
# Parent  eb04ac3a83279a97910c19d7d433427fa1572aa7# Parent  d5ebbcccc41be4614fd581ce11fa45e7cd79ce2a
merging from devel

diff -r d5ebbcccc41b -r 3f4bdea2abbf doc/tmpl/current.html
diff -r d5ebbcccc41b -r 3f4bdea2abbf iro/iro.py
diff -r d5ebbcccc41b -r 3f4bdea2abbf iro/tests/__init__.py
diff -r d5ebbcccc41b -r 3f4bdea2abbf iro/tests/test.pdf