Eric Lippmann 1c74fd7028 Merge branch 'master' into feature/display-documentation-4820 ... Conflicts: modules/doc/library/Doc/DocParser.php		2014-08-19 13:39:48 +02:00
..
doc	doc: set page title	2014-08-19 13:38:18 +02:00
monitoring	Fix float formatting of timeline circle margins and widths	2014-08-15 13:39:02 +02:00
test	Remove missed echo instruction for debug purposes	2014-06-30 14:06:11 +02:00
translation	Remove license headers from all files	2014-07-15 13:43:52 +02:00