woutervanwijk 43d80e9a77 Merge branch 'master' into develop ... Conflicts: webclient/js/functionsvars.js		2013-11-12 20:54:53 +01:00
..
ajax-loader.gif	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
icons-18-black.png	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
icons-18-white.png	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
icons-36-black.png	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00
icons-36-white.png	Merge branch 'master' into develop	2013-11-12 20:54:53 +01:00