Git commits in Moodle 1.9.x by Daren Chandisingh

commit 18174ef08201ddfa4343588c56c3aaafbde0847c
Author: Daren Chandisingh <daren.chandisingh@lancashire.gov.uk>
Date:   Mon, 21 Feb 2011 19:49:49 +0800
Tag:    v1.9.12

MDL-26534 allow iframes in course category descriptions

commit 1ee988357f9c391045ab601a2879e812ab2ff3a9
Author: Daren Chandisingh <daren.chandisingh@luns.net.uk>
Date:   Wed, 02 Feb 2011 18:33:16 +0800
Tag:    v1.9.14

MDL-23872 Forms Library : Updated MoodleQuickForm to honour setConstant(), prevents injection.  - resolved conflict