Merge branch 'MDL-35519_book_cancel_23' of git://github.com/andyjdavis/moodle into...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 21:08:02 +0000 (23:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Oct 2012 21:08:02 +0000 (23:08 +0200)

Trivial merge