Added freenode.txt for Freenode IRC channel verification (to reclaim #airtime)
Merge branch '2.5.x'
Enforce a minimum PHP version of 5.4.0 on install and upgrade.
Merge branch '2.5.x'
Merge branch '2.5.x'
Merge branch 'master' of github.com:sourcefabric/Airtime
Merge branch '2.5.x'
Delete freenode.txt
CC-5583: Force database to be UTF8 regardless of terminal locale
CREDITS update for 2.5.1
CC-5584: Quick PHP version check (5.4+)

* Thanks to John Chewter for connecting the dots on this one!
Nothing to see here, just a typo...
Merge branch 'master' of github.com:sourcefabric/Airtime into 2.5.x
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
CC-5589: SQL error when adding/moving a scheduled item

Error was occuring when a moved item didn't exist in a linked show instance
Error was also occuring when trying to insert item into a schedule localtion
that does not exist in a linked instance.

Fixed by skipping the move action if the file does not exist in a linked instance,
cleaning up the position numbers after deleting schedule items, and by
setting the insert time to the show start time in a linked instance is empty
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

Conflicts:
	install_minimal/include/airtime-install.php
CC-5593: Overlapping Show Bug

Need to check if the show instance has been deleted
CC-5593: Overlapping Show Bug

Get instance depending on whether instance id is provided or not
Small fix to overlapping show check
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show

Create a new cc_show_day rule instead of a new cc_show