From: Russ Allbery <rra@stanford.edu>
Date: Tue, 7 Dec 2010 17:35:14 +0000 (-0800)
Subject: Merge commit 'upstream/2.0' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bb5892bb0bc69aad1b59a0666f91f3161870e216;p=packages%2Fa%2Fafs-monitor.git

Merge commit 'upstream/2.0' into debian
---

bb5892bb0bc69aad1b59a0666f91f3161870e216