Merge branch 'master' of ustrat:git/staging/profile
authorMark Wooding <mdw@distorted.org.uk>
Fri, 12 May 2017 13:29:56 +0000 (14:29 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 12 May 2017 13:29:56 +0000 (14:29 +0100)
* 'master' of ustrat:git/staging/profile:
  dot/emacs: Bind C-c k to `compile'.
  bin/xpra-start-xdummy: Give a relative path to the configuration file.


Trivial merge