Simon Welsh fbce9fd7cd Merge branch '3.1'
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
..
2013-06-04 12:57:09 +12:00
2013-07-05 10:22:58 +12:00
2013-06-15 11:52:02 +02:00
2012-12-10 17:52:01 +01:00