[DRE-commits] [SCM] coderay.git branch, master, updated. debian/1.0.5-1-4-g74111fc

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 088a73005e04c274e2b7d4ab7d49dce35d8caa9d
Merge: e1d72cbaab3befd9f667a94fefd80d5e78be1fc4 6f628cfbbfa5175fab9c910d1c0a6c5ea13d85b8
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Apr 26 19:25:06 2012 +0900

    Merge tag 'upstream/1.0.6'
    
    Upstream version 1.0.6
    
    Conflicts:
    	lib/coderay/encoders/html.rb
    	lib/coderay/encoders/html/numbering.rb
    	lib/coderay/helpers/file_type.rb
    	lib/coderay/scanners/css.rb
    	lib/coderay/scanners/python.rb
    	lib/coderay/version.rb
    	metadata.yml
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>


-- 
coderay.git