merge app-import trunk and branch
authorp.kelbert <p.kelbert@localhost>
Wed, 26 Jun 2013 13:32:19 +0000 (13:32 +0000)
committerp.kelbert <p.kelbert@localhost>
Wed, 26 Jun 2013 13:32:19 +0000 (13:32 +0000)
commitb39632f1364df3b8a77188312998a4fade82e18f
treebf8608dea1356ca4e44f4ff6df555464f8ca0bcd
parentc9ba1c2df8fe892803f56a24f7a2829ca953bdd3
merge app-import trunk and branch