[blinken/f20: 9/9] Merge branch 'master' into f20

[Rex Dieter]

commit 03e5c6ab5ccee4e2e9e94ecb276f5df1e250ed35
Merge: d8f7efe 742d114
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:11:45 2014 -0600

    Merge branch 'master' into f20

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