Commit 61d8c8aa42261d96943e211f1c8b231f8203a755

Steffen Jaeckel 2014-09-28T13:59:17

Merge branch 'feature/timing_resist' into develop