Martin Konecny 563f5b64d2 Merge branch '2.3.x' into devel ... Conflicts: debian/postinst		2013-04-02 12:31:48 -04:00
..
etc	…
po	…
source	…
usr	…
changelog	Don't run the airtime-install script if Apache has not been configured [#CC-5020]	2013-03-19 17:45:09 +00:00
compat	…
config	…
control	Merge branch '2.3.x' into devel	2013-04-02 12:31:48 -04:00
copyright	Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files	2012-11-22 15:37:08 +00:00
docs	…
gbp.conf	…
install	…
postinst	Merge branch '2.3.x' into devel	2013-04-02 12:31:48 -04:00
postrm	…
preinst	…
prerm	…
rules	…
templates	…
watch	…