Merge branch 'xdg-init'
authorSteve Youngs <steve@sxemacs.org>
Sat, 9 May 2015 21:23:55 +0000 (07:23 +1000)
committerSteve Youngs <steve@sxemacs.org>
Sat, 9 May 2015 21:23:55 +0000 (07:23 +1000)

Trivial merge