Merge branch 'timing' into develop
authorthefiddler <stapostol@gmail.com>
Tue, 7 Jan 2014 21:19:22 +0000 (22:19 +0100)
committerthefiddler <stapostol@gmail.com>
Tue, 7 Jan 2014 21:19:22 +0000 (22:19 +0100)

Trivial merge