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

[Rex Dieter]

commit c9c0471d31afeee687288480dd4b519227070b01
Merge: 72e3d9f f441ff9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:19:48 2014 -0500

    Merge branch 'master' into f20

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