Merge remote-tracking branch 'EvanDotPro/hotfix/zf2-api-updates'
authorRob Allen <rob@akrabat.com>
Tue, 8 May 2012 18:32:17 +0000 (19:32 +0100)
committerRob Allen <rob@akrabat.com>
Tue, 8 May 2012 18:32:17 +0000 (19:32 +0100)

Trivial merge