Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x
authorEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 19:28:17 +0000 (14:28 -0500)
committerEvan Prodromou <evan@controlyourself.ca>
Fri, 6 Feb 2009 19:28:17 +0000 (14:28 -0500)
commitbe6ce275387971692944c3677ea5e03f6fd038f8
tree8f35f787e90a522a354b8702f5e712eae8b1d6c7
parent5cdead72cdee1261e506cdc89dd81242bfb9ba84
parentadcbb483623f10fa7ed76cc85c6c20e3647fa9f3
Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x

Conflicts:

lib/util.php
lib/util.php