4 Commits

Author	SHA1	Message	Date
Sebastian Grewe	fcaffe7fc0	[MERGE] Fix conflicts with development	2014-05-03 12:18:30 +02:00
Sebastian Grewe	bf036b13a6	Merge branch 'development' into move-internals	2014-04-28 11:26:47 +02:00
Sebastian Grewe	43bf7be200	[FIX] Merge conflict with development	2014-04-24 11:43:38 +02:00
Sebastian Grewe	1456bd21ef	[MOVED] Removed include and templates from public [TESTING]	2014-04-20 15:34:55 +02:00