Elementary migration revision 70341

Merge remote branch 'remotes/origin/upstream'

Conflicts:
	src/lib/elm_datetime.c
	src/lib/elm_genlist.c

diff --cc src/lib/elm_config.h
Simple merge

diff --cc src/lib/elm_diskselector.c
Simple merge

diff --cc src/lib/elm_entry.h
Simple merge

diff --cc src/lib/elm_genlist.h
Simple merge

diff --cc src/lib/elm_index.h
Simple merge

diff --cc src/lib/elm_plug.h
index 01afbbd,ed79d85..ed79d85
mode 100755,100644..100755
--- 1/src/lib/elm_plug.h
--- 2/src/lib/elm_plug.h
+++ b/src/lib/elm_plug.h

diff --cc src/lib/elm_win.h
Simple merge