[DRE-commits] [SCM] cucumber.git branch, master, updated. debian/1.0.2-1-2-gccf763b

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit ccf763b043748a8d08a0997349cb69b99c6eaf58
Merge: 0c22561f14a53a126c6d217fefebead3899683fb 84018b7fa15c4e68807de5c6fa38e37a9887c61c
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Thu Sep 8 21:37:37 2011 -0700

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/copyright


-- 
cucumber.git