wet-boew/wet-boew — pull request #933 by LaurentGoderre (2013-01-08 18:37:16+00:00)
Title: Merge branch 3.0

@pjackson @nschonni can someone review this, there was a lot of merge conflicts and I want to be sure I didn't override anything.