log

age author description
Thu, 16 Feb 2012 16:40:29 -0600 Matt Mackall merge with stable
Thu, 16 Feb 2012 15:58:51 -0600 Matt Mackall filemerge: remove some redundancy in decorators/docstrings