[python-manuel/f18: 3/3] Merge branch 'master' into f18

Mon Jan 28 23:42:14 UTC 2013

commit 1725ac8bdf15960c3bf542522482b500e7a12d66
Merge: e7ff23d 4726771
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Mon Jan 28 16:41:47 2013 -0700

    Merge branch 'master' into f18

 .gitignore         |    2 +-
 python-manuel.spec |    7 +++++--
 sources            |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)
---