move them around,
blah
Merge branch 'master' into get_rid_of_flat_skin
add libgnutls28-dev as an option to libgnutls-dev
add the other libjpeg*-dev options, any of which should do
Update zoneminder.cmake.f20.spec
Update zoneminder.cmake.el6.spec
Merge branch 'master' into get_rid_of_flat_skin
should now be functional
remove the flat skin
Merge branch 'get_rid_of_flat_skin' into iconnor

Conflicts:
	web/skins/flat/views/console.php
	web/skins/flat/views/js/montage.js
	web/skins/flat/views/monitor.php
	web/skins/flat/views/montage.php
	web/skins/flat/views/watch.php
move up to release 3