Elgg/Elgg — pull request #7523 by ewinslow (2014-11-23 02:48:56+00:00)
Title: 1.9 to 1.x, up until right before the whitespace changes

partial update of 1.9 to 1.x. Going to try to run the whitespace script in 1.x before merging up.