[moodle/f13/master: 6/6] Merge branch 'master' into f13

[Jon Ciesla]

commit 1923deba4eeea57408c12ffd3b7d25afd604fcc3
Merge: 5bd8f62 b99665e
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Oct 12 09:36:09 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	moodle.spec

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