Merge branches 'master' and 'new_feature' into new_feature
authorGreg Gay <ggay@ocad.ca>
Wed, 21 Sep 2011 17:54:49 +0000 (13:54 -0400)
committerGreg Gay <ggay@ocad.ca>
Wed, 21 Sep 2011 17:54:49 +0000 (13:54 -0400)

Trivial merge