ce311c642b2b248b1cd83779c4530adb436b4eb1 |
|
03-Sep-2011 |
Luke Smith <lsmith@yahoo-inc.com> |
Reinstate code changes
This is a revert-revert. Code changes made on
the 3.4.0+ branch were reverted on the branch,
then this revert commit merged into master (since
all commits on 3.4.0+ should be documentation, a
blanket merge should be safe), which then reverted
the code changes where they were appropriate.
Short form: this commit allows blanket merges from
3.4.0+ onto master again at the expense of some
git log history confusion for IO.
This reverts commit 3327eba7caef16e3d5b0496f979b07c9998e70b7. |