Merge master.
authorCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 14:30:32 +0000 (15:30 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 16 Jul 2014 14:30:32 +0000 (15:30 +0100)
commitfc56dc97103d00437843a31e1ef0c4915900ad1a
tree958c909b14b3c9c2f2ec08dd30e5b06e214db1b5
parent94201bd2a5a4cb391b7f2bdeba56b928fed7cfe1
parent4861afbaab9c3710152d80f15c7a239c26deb74b
Merge master.
ChangeLog
src/lib/util.cc
test/util_test.cc