Merge branch 'feature/include_string_tag'
authorStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 29 Nov 2010 18:32:20 +0000 (13:32 -0500)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Mon, 29 Nov 2010 18:32:25 +0000 (13:32 -0500)

Trivial merge