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

[Jon Ciesla]

commit 05f862c430c49c0850dcfda3dce50e2a972e2204
Merge: b997999 a326718
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Fri Dec 9 11:57:48 2011 -0600

    Merge branch 'master' into el6

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