[analitza/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 5bbe0ce985cb8207da8299f54473a9fe4f6ad37d
Merge: e1bc98e 182ead7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 16:28:09 2012 -0600

    Merge branch 'f18' into f17

 .gitignore    |    1 +
 analitza.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---