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

[Rex Dieter]

commit 461870911f98698453405ab323770cdd3becd832
Merge: 7b9f763 1c1c1a7
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 06:40:34 2012 -0600

    Merge branch 'f18' into f17

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