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

[Jon Ciesla]

commit b99799996c7de81df4a049e5040eb362d06e620f
Merge: e12b2a6 6c8f30b
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Fri Oct 21 14:03:02 2011 -0500

    Merge branch 'master' into el6

 .gitignore  |    1 +
 moodle.spec |    7 +++++--
 sources     |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---