[DRE-commits] [SCM] capistrano.git branch, master, updated. debian/2.9.0-1-12-gc682643

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 434b4726ac8379e5f82a81f9911e0f6a8619710b
Merge: f89338eca661eb9979611ce285d02248a76a1636 27361442a68ae557d178dbef12ea34720fa6b9ad
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jun 29 17:45:20 2012 -0300

    Merge tag 'upstream/2.12.0'
    
    Upstream version 2.12.0
    
    Conflicts:
    	test/utils.rb


-- 
capistrano.git