Merge pull request #101 from SocalNick/master
authorMaks <github.maks3w@virtualplanets.net>
Fri, 3 Aug 2012 05:50:52 +0000 (22:50 -0700)
committerMaks <github.maks3w@virtualplanets.net>
Fri, 3 Aug 2012 05:50:52 +0000 (22:50 -0700)
commit4ecb27ec28c1fd36be3f68a80d5cf3c082d23505
tree707f1d40cd7b93d0cd33cdbcca5fcdeda1154c85
parent9f021fda9862f9937864a7fbc2b5b20203bc1fd0
parent0369e2884dc150cd4aee0e7eae4fe8c75518d17c
Merge pull request #101 from SocalNick/master

Updating SHA for ZF2 via composer to same as submodule