Damian Mooyman 48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
2015-12-22 14:07:52 +13:00
..
2015-07-20 10:48:01 +01:00
2015-04-30 16:21:33 +12:00
2015-04-30 11:53:02 +12:00
2014-08-19 09:17:15 +12:00
2015-12-14 16:50:34 +00:00
2015-04-30 11:20:46 +12:00
2014-08-19 09:17:15 +12:00