Alexander Klimov 570b31fe05 Merge branch 'master' into feature/deduplicate-puppet-code-6842 ... Conflicts: packages/rpm/etc/icingaweb2/resources.ini		2014-10-20 13:12:31 +02:00
..
debian	packaging: build debian packages	2014-06-05 02:53:47 +00:00
files	Remove license headers from all files	2014-07-15 13:43:52 +02:00
rpm	Merge branch 'master' into feature/deduplicate-puppet-code-6842	2014-10-20 13:12:31 +02:00