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

[Rex Dieter]

commit bcb8d475aaec6cbadea672ef9f95770dd82c7399
Merge: 2574676 a03fd61
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 08:33:19 2013 -0600

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore

 .gitignore |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---