Permalink
Browse files

Merge branch '2.3' of https://github.com/larryb82/cakephp into 2.3

Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
  • Loading branch information...
2 parents 02c1b49 + 1ab8f98 commit c3af467476a9a1b2e46f69e5cef76c3dfa2e205b @larryb82 committed Nov 3, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit c3af467

Please sign in to comment.