Isaac Connor 70c63bd394 Merge branch 'master' into storageareas ... Conflicts: db/zm_create.sql.in distros/debian/control distros/ubuntu1204/changelog src/CMakeLists.txt src/zm_config_defines.h src/zm_monitor.h		2014-11-19 14:11:39 -05:00
..
debian	Merge branch 'master' into storageareas	2014-11-19 14:11:39 -05:00
debian_cmake	* distros/debian -> Autotools	2014-11-11 22:48:04 +01:00
fedora	Update rpm specfiles to make use of zmeditconfigdata.sh	2014-11-15 12:55:33 -06:00
opensuse	Merge pull request #502 from knnniggett/systemd-2	2014-09-03 15:59:42 -04:00
redhat	Update rpm specfiles to make use of zmeditconfigdata.sh	2014-11-15 12:55:33 -06:00
ubuntu1204	Merge branch 'master' into storageareas	2014-11-19 14:11:39 -05:00