reverted change to avoid conflict

This commit is contained in:
Andreas Preikschat 2013-04-20 11:06:26 +02:00
parent 465fc7bff1
commit f82000eaa2