commit 701d02d346e85f9ad23c2251b537529ef2987fd9 Merge: 61e1277 2d7acd6 Author: Orion Poplawski <orion at cora.nwra.com> Date: Wed May 11 14:39:33 2011 -0600 Merge from el6 - 1.16.5 .gitignore | 2 +- mediawiki116.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) ---