Merge remote branch 'remotes/origin/upstream'
[framework/uifw/edje.git] / packaging /
drwxr-xr-x   ..
-rw-r--r-- 2423 edje.spec