Merge branch 'master' of git.ganneff.de:misc
authorJoerg Jaspert <joerg@ganneff.de>
Mon, 18 Mar 2013 14:57:09 +0000 (15:57 +0100)
committerJoerg Jaspert <joerg@ganneff.de>
Mon, 18 Mar 2013 14:57:09 +0000 (15:57 +0100)
commit3c7113e5383175133f435e3f70577a871787017e
tree85d8ad335b7d727445a1e474d99b17563ba2cb94
parent106799971b72a9ddae4f69c073d14feaf50098ad
parent1772b06e51a4cb0d64cf82e7be77cf6c92619dc7
Merge branch 'master' of git.ganneff.de:misc

* 'master' of git.ganneff.de:misc:
  amy ipv4 only
  One .Xdefaults only