From: Kyle Spraggs <theman@spiffyjr.me>
Date: Sun, 20 May 2012 20:01:14 +0000 (-0500)
Subject: Merge branch 'master' into feature/composer
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=a51d56c7a2bffe523b2b7846de08156c07427631;hp=-c;p=zf2.biz%2Fgalerie.git

Merge branch 'master' into feature/composer

Conflicts:
	vendor/ZendFramework
---

a51d56c7a2bffe523b2b7846de08156c07427631