Merge branch 'master' of git@github.com:kohana/kohana

This commit is contained in:
Geert De Deckere 2009-11-17 17:21:32 +01:00
commit 5040ab3fa4
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit f5dcad340924a012185d38c739dd5f935b69df0d
Subproject commit 3ca1145d05471529a84aeb1a4a5b72d22d0d3a81

2
system

@ -1 +1 @@
Subproject commit 7f87b0ddcd3eeca48c02851799500f76019a20d0
Subproject commit d78bf96b36ea2047ae1f834f6b8d0f01bc915c87