Merge branch 'master' into reorg

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-03-16 18:47:04 -04:00
commit 3a020e599e
6 changed files with 50 additions and 18 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 3"
date="2011-03-16T17:46:40Z"
content="""
Alright, I've added #idefs and the symlink timestamp mirroring feature will be unavailable on OSX until I get a version that works there.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 4"
date="2011-03-16T20:32:01Z"
content="""
Just tried it out on my mac and it's working again. I guess this issue could be closed for now.
"""]]