commit e2b5529a2513be2f2bd58e2e8e8fb4edca294e5f Merge: 9eb4c6e fd63407 Author: Rex Dieter <rdieter at math.unl.edu> Date: Fri Mar 8 16:59:48 2013 -0600 Merge commit 'fd6340769eaca721d9d0d6d83c901b971ab5bb5b' into f17 qgis.spec | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) ---