[libhocr/f19: 3/3] Merge branch 'master' into f19

[Jon Ciesla]

commit 4a9f301c10e1c68cd87b73057048746140f9b998
Merge: a3e7fce d740590
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Apr 25 13:02:40 2013 -0500

    Merge branch 'master' into f19
    
    Conflicts:
    	libhocr.spec

 libhocr.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---