commit f20c90b58796ec92a21447e0e2bd7f1c2efb2a30
Merge: e8821df 64491ed
Author: Jerry James <loganjerry at gmail.com>
Date: Mon Jun 6 11:21:03 2011 -0600
Merge branch 'master' into f14
.gitignore | 2 +-
gappa.spec | 17 ++++++++++++-----
sources | 2 +-
3 files changed, 14 insertions(+), 7 deletions(-)
---