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

[Christof Damian]

commit 33f06fc3da45a3624f541cd1c66be9368ffdd099
Merge: a932d48 371af76
Author: Christof Damian <christof at damian.net>
Date:   Fri Apr 19 19:39:21 2013 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore               |    2 +-
 LICENSE                  |  807 +++++++++++++++++++
 README.markdown          | 1939 ++++++++++++++++++++++++++++++++++++++++++++++
 php-deepend-Mockery.spec |   17 +-
 sources                  |    4 +-
 5 files changed, 2763 insertions(+), 6 deletions(-)
---