Merge branch 'patches/050_ck_patch' into patches/060_speeling
authorIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:02:25 +0000 (23:02 +0000)
committerIan Beckwith <ianb@erislabs.net>
Sat, 28 Jan 2012 23:02:25 +0000 (23:02 +0000)
commit0c39849f27b19feb05c593f0202bc6ba04972788
tree886d829b9eda1440c97834ec74b49813969e5313
parent575dde0af29eca2047698fd50bae9bf6dbeade5d
parent004e5cd8eac5226c51f0f83b82735d88be5ab2e6
Merge branch 'patches/050_ck_patch' into patches/060_speeling