[DRE-commits] [SCM] shelr.git branch, master, updated. upstream/0.11.6-13-g55a4ef7

[Antono Vasiljev]

The following commit has been merged in the master branch:
commit 3dd4900b94b270f5ef19229cae3a499b00b66cea
Merge: 07666bee10d0d39c4bc752c67097ea59ff9ff014 bd093dbb93038f70d578dd5ad8f1fdd0eab1d611
Author: Antono Vasiljev <self at antono.info>
Date:   Tue Apr 3 21:20:18 2012 +0300

    Merge tag 'upstream/0.12.1'
    
    Upstream version 0.12.1
    
    Conflicts:
    	.gitignore


-- 
shelr.git