Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 23:29:01 +0000 (01:29 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jul 2013 23:29:01 +0000 (01:29 +0200)
commite780e5cb8ff91a2bd3651c8e89284bfd188b20a1
tree16ee4cfe1a7d949530f77c38410bef62154e2391
parentadbdb9b5c7d6b287231d9e3f224b53ac03a8357a
parente50220f8407b9be08f9a15a3389bdf2974bad3d5
Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges

Conflicts:
lib/db/upgrade.php
version.php
lib/badgeslib.php
lib/db/install.xml
lib/db/upgrade.php
version.php