[moodle/el6: 2/2] Merge branch 'master' into el6

[Jon Ciesla]

commit e12b2a6cf64681c93c4208edacb382b466ff99dc
Merge: acf503b 37a42a6
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Sep 27 10:54:24 2011 -0500

    Merge branch 'master' into el6

 moodle-cron |    2 +-
 moodle.spec |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
---