Klaus 9cd3ac3f87 Merge branch 'bbb-2x-mconf' into fix-presenter-rule		2017-07-25 13:43:26 -03:00
..
config	Merge branch 'bbb-2x-mconf' into fix-presenter-rule	2017-07-25 13:43:26 -03:00
locales	Merge remote-tracking branch 'upstream/master' into merge-master-mconf	2017-07-17 13:33:45 -03:00