Merging CodeIgniter Builds

[eluser]awpti[/eluser]
Just make sure to exclude the config/ directory in your app (assuming nothing has changed between your version and the trunk).

I just did this myself a bit ago.

onlytechnews is running off the latest trunk at this point.
awpti.org is next