Merge remote branch 'origin/master' into tzz-auth-source-rewrite
authorTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Feb 2011 14:37:58 +0000 (08:37 -0600)
committerTed Zlatanov <tzz@lifelogs.com>
Sun, 6 Feb 2011 14:37:58 +0000 (08:37 -0600)
commitc16de33bf208caadf4bb0ca8fbc4cf559f8efd3b
treeecaf9e4541057f31f4db4f1a5708c7154417e947
parent7efd26196cf28c800afbb4a773fde6d149d407bf
parent051c1fc03aadf16a08d4222dda114fd461563397
Merge remote branch 'origin/master' into tzz-auth-source-rewrite

Conflicts:
lisp/ChangeLog
lisp/ChangeLog