K 10
svn:author
V 3
hrs
K 8
svn:date
V 27
2016-12-12T19:24:52.413791Z
K 7
svn:log
V 125
Temporarily backout the previous commit because it was totally broken due to
unresolved merge conflicts.

Pointy hat to:	hrs

END