Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 4 Sep 2012 05:43:11 +0000 (13:43 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 4 Sep 2012 05:43:11 +0000 (13:43 +0800)
commit736cc6a24691634468d578fe88881e4dd24a7347
treea358a9c0131506a51d0a4462bcf9967fbdcd2bdf
parentb5b82ae943836c4cbd19e99cd7c4f9627bd34029
parentf361678362dddc74552be117558281d29b506656
Merge branch 'MDL-26504_blog_unregister' of git://github.com/andyjdavis/moodle

Conflicts:
lib/db/upgrade.php
version.php
lib/db/upgrade.php
version.php