Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git] / httemplate / elements / ckeditor / plugins / iframe / images / placeholder.png
httemplate/elements/ckeditor/plugins/iframe/images/placeholder.png