Merge remote-tracking branch 'stapelberg/master'
authorPeter Palfrader <peter@palfrader.org>
Sun, 29 Jan 2017 08:57:39 +0000 (09:57 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 29 Jan 2017 08:57:39 +0000 (09:57 +0100)
* stapelberg/master:
  static-mirroring: describe maintenance behavior
  add README for the static mirroring infrastructure


Trivial merge