[moodle/f12/master: 11/11] Merge branch 'master' into f12

[Jon Ciesla]

commit 612b2e59d05123174bdb2ef20e31e672692ea2e6
Merge: c52ac41 b99665e
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Tue Oct 12 09:48:18 2010 -0500

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

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