Conflicts:
[freeside.git] / ng_selfservice / elements / session.php
2014-04-24 Ivan Kohlerselfservice, TNG, RT#22193