Eric Lippmann db5c6631d9 Merge branch 'master' into feature/display-documentation-4820 ... Conflicts: modules/doc/library/Doc/Controller.php		2014-07-01 12:42:55 +02:00
..
Icinga	Merge branch 'master' into feature/display-documentation-4820	2014-07-01 12:42:55 +02:00
IcingaVendor	vendor/lessphp: we don't need travis.yml right now	2014-06-05 00:15:31 +00:00