[php-deepend-Mockery/el6: 7/7] Merge branch 'master' into el6

[Christof Damian]

commit a932d48a829cce89c18a88a4d574c2770ce1b78d
Merge: 484d750 e6c3693
Author: Christof Damian <christof at damian.net>
Date:   Sun Mar 4 18:15:00 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	php-deepend-Mockery.spec
    	sources

 .gitignore               |    4 +---
 php-deepend-Mockery.spec |   13 +++++++++++--
 sources                  |    6 +++---
 3 files changed, 15 insertions(+), 8 deletions(-)
---
diff --cc .gitignore
index e528327,b2a8fcf..1aa71e3
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,4 +1,1 @@@
--README.markdown
--LICENSE
--Mockery-0.6.3.tgz
+ /Mockery-0.7.2.tgz