| commit | b8f634b9f6316fff9633c5a1c7ec0cbcd82345e9 | |
| author | Andrew Coulton <andrew@ingenerator.com> | |
| Tue, 11 Nov 2014 11:15:42 +0000 (11 11:15 +0000) | ||
| committer | Andrew Coulton <andrew@ingenerator.com> | |
| Tue, 11 Nov 2014 11:15:42 +0000 (11 11:15 +0000) | ||
| tree | 74f232ccb39d6ae451ba20445621f4bfaa5833ab | treesnapshot (tar.gz zip) |
| parent | 18abaa111fd098de8fcf43577bafdbaaca67c477 | commitdiff |
| parent | 1c31a9928d4efb3f88fa251ca827fb479b81b36f | commitdiff |
Merge pull request #70 from kohana/3.2/master
Merge 3.2/master into 3.3/develop
Closes #70, merged manually due to github merge problem
Merge 3.2/master into 3.3/develop
Closes #70, merged manually due to github merge problem