[php-deepend-Mockery/f16: 3/3] Merge branch 'master' into f16

[Christof Damian]

commit 381c4a37c6ffad3b54cdece0f573e945f3e9f43c
Merge: 45cacd9 e6c3693
Author: Christof Damian <christof at damian.net>
Date:   Sun Mar 4 18:03:53 2012 +0100

    Merge branch 'master' into f16

 .gitignore               |    1 +
 php-deepend-Mockery.spec |   10 ++++++++--
 sources                  |    6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)
---