Merged master in messagebox.
Added proper limits to the oae-discussions module.
Merged master in messagebox.
Reverting config file
Merge branch 'messagebox' of git://github.com/simong/Hilary into messagebox
Merge master in issue-429-messagebox-entity-urls