Merge branch 'release' into gilbert
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 28 Apr 2011 20:13:55 +0000 (16:13 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 28 Apr 2011 20:13:55 +0000 (16:13 -0400)
commita2d75eae2cab588a28155b9c901935aa8d664d5f
treecf4569f4619ea9ed3dd1dc98284adcb494d50c87
parent1eb51a5b5ac85607af67275ff3684febd84406c9
parent4e50e94d757fc254b6378997d69887a28ff44297
Merge branch 'release' into gilbert

Conflicts:
README
README
README.markdown