2012-03-22: release 0.2.1. merge from integration
Merge branch 'integration'
2013-03-06: resetting the branch indication file
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'integration'
Merge branch 'kreincke' into integration
Merge branch 'kreincke'
Merge branch 'kreincke' into integration
Merge branch 'kreincke'
Merge branch 'kreincke' into integration
Merge branch 'integration'