Merge branch '3.2/develop' into 3.3/developv3.3.0
commit20dfdf0984ab2cc7bc870c84923b017f886b2add
authorLorenzo Pisani <zeelot3k@gmail.com>
Sun, 12 Aug 2012 18:54:49 +0000 (12 11:54 -0700)
committerLorenzo Pisani <zeelot3k@gmail.com>
Sun, 12 Aug 2012 18:54:49 +0000 (12 11:54 -0700)
tree8dd693771edd2aab62596354dba31fb96a722239
parentafd0991707c9231be725fab9eb03d5180b3b46e7
parent32e8cd5a42c587e939e59aea03052265c3eadc7d
Merge branch '3.2/develop' into 3.3/develop

refs #4544
classes/Kohana/Controller/Userguide.php