| commit | c3eb5e1879a9cf3fa497b5f3365c246a85c94898 | [log] [tgz] |
|---|---|---|
| author | Eric Barnes <eric@ericlbarnes.com> | Wed Jan 04 21:25:56 2012 -0500 |
| committer | Eric Barnes <eric@ericlbarnes.com> | Wed Jan 04 21:25:56 2012 -0500 |
| tree | c632591c646927c4c60ace51da68abd9134a33a2 | |
| parent | 3b376595183e0e0db5559ccbfc368c442408dca9 [diff] | |
| parent | 37b1d9ba5bef4594aaf458e0406599bdf33deb46 [diff] |
Merge branch 'patch-1' of https://github.com/dixy/CodeIgniter-1 into dixy-patch-1 Conflicts: user_guide_src/source/changelog.rst