Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
commit093a6fe77fc39b06c804fbe4bfcac9834a52c966
tree57bd4c5c3a4944639efad79c769d5eff7a60bb2b
parent88a4cb473439f5a2875260368b92fac1bb808c12
parent2bc421220945ed6a99888b16b619e66c2d0097b1
Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/styles.css
lib/editor/atto/styles.css