master updated (4d99388 -> e3f5f5d)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  4d99388   Prevent GDK warning about missing event devices in most 
cases
       new  99abafd   * admin/automerge: Use mktemp if it exists.
       new  e3f5f5d   * admin/automerge: Fix quoting of some variables.


Summary of changes:
 admin/automerge | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)