Fix git conflict.
authorKaren Stevenson
Sun, 29 Jan 2012 03:07:55 +0000 (22:07 -0500)
committerKaren Stevenson
Sun, 29 Jan 2012 03:07:55 +0000 (22:07 -0500)
commit83c217d7a6d2daa1fa2a215d1f7ce724a7205c22
treeea1efb28922c8a4c9372140547be339eb96512ca
parent27b9dfba98f5f8ff37efc5054a17e3d23341dab7
parenta7490ab9840d09aa478cc74306b51a56c51e8fde
Fix git conflict.
CHANGELOG.txt