Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/doc...
authorMark Wooding <mdw@distorted.org.uk>
Fri, 24 Sep 2010 10:20:17 +0000 (11:20 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 24 Sep 2010 10:20:17 +0000 (11:20 +0100)
commit07c947f4c1eda2dc087dcf2b12e0bb76a437d372
tree803047dfab8b8bbd6a3434efaca4740cc3bb378c
parent0420ac5be66c4d37bd37836985f7ec73ff676ea4
parentaa1ee4d8e422fd402be12ce1fff728090e3199b7
Merge branch 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/doc/texmf

* 'master' of git+ssh://metalzone.distorted.org.uk/~mdw/public-git/doc/texmf:
  mdw-crypto.bib: More bibliography entries.
  mdw-crypto.bib: Add a few references.

Conflicts:
mdw-crypto.bib
mdw-crypto.bib