Merge branch 'test-timing'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 15 May 2016 17:03:49 +0000 (19:03 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sun, 15 May 2016 17:03:49 +0000 (19:03 +0200)

Trivial merge