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

[Jon Ciesla]

commit acf503be3888a8a99d08eee6b712721f48b80295
Merge: a104908 d0fea1e
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Aug 16 12:22:08 2011 -0500

    Merge branch 'master' into el6

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