[audiocd-kio/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 215d646671e9bfb5e0e0c4bf9ce6ea4859189618
Merge: b04196c a877d50
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 07:28:15 2013 -0600

    Merge branch 'f18' into f17
    
    Conflicts:
    	.gitignore

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