Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2012-12-02 17:33:21 -04:00
commit 98231b3248
2 changed files with 16 additions and 1 deletions

View file

@ -15,4 +15,4 @@ git-annex.
Or, I can work on [[Android_porting|design/assistant/android]], and try to
get the assistant working on Android's built-in storage.
[[!poll open=yes 55 "solve the symlink problem first" 15 "port to Android first" 0 "other"]]
[[!poll open=yes 56 "solve the symlink problem first" 15 "port to Android first" 0 "other"]]