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

[Jon Ciesla]

commit 9d7c020a08722cd4d6d62de39a29ed611dc89d1c
Merge: f9ab016 9633837
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Mon Mar 25 10:42:05 2013 -0500

    Merge branch 'f17' into el6
    
    Conflicts:
    	.gitignore

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