[mediawiki/f14/master: 2/2] Merging branch master into f14.

[Axel Thimm]

commit aedf79c21a05c960c15c205168b976689d1b4cb6
Merge: 412b1ec 21cd03a
Author: Axel Thimm <Axel.Thimm at ATrpms.net>
Date:   Sun May 8 23:01:50 2011 +0200

    Merging branch master into f14.

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