From: Evan Coury <me@evancoury.com>
Date: Thu, 22 Dec 2011 14:07:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'BostjanOb/patch-1' into bostjan-patch
X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=bb098901d01832d5b2c5e3e7abbd604adcaa4d04;hp=26b842365013594ee6c41c1c83c3b07adc9f753c;p=zf2.biz%2Fgalerie.git

Merge remote-tracking branch 'BostjanOb/patch-1' into bostjan-patch
---