tree 541a419d742795855409539c922cdf39f0d42a66
parent c36dca6b61153a55d7c3bde79369df8e3f8626bf
parent c3736de047f352c83499d23a9b87ed864d834cfe
author Yaroslav Luzin <jardev@gmail.com> 1337630890 +0300
committer Yaroslav Luzin <jardev@gmail.com> 1337630890 +0300

Merge branch 'dev' into t50_hide_project_icon_placeholder