[Git-commits] [grml/grml-desktop] b001ef: Update grml-etc conflict due to configfile move

[Ulrich Dangel]

  Branch: refs/heads/master
  Home:   https://github.com/grml/grml-desktop

  Commit: b001ef62c19bcc1f89b502ba2535dcb319e4e8c9
      https://github.com/grml/grml-desktop/commit/b001ef62c19bcc1f89b502ba2535dcb319e4e8c9
  Author: Ulrich Dangel <mru at grml.org>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M debian/control

  Log Message:
  -----------
  Update grml-etc conflict due to configfile move