Merge branch 'master' into doc-strings
authorAlejandro R Sedeño <asedeno@google.com>
Thu, 4 Apr 2013 02:27:17 +0000 (22:27 -0400)
committerAlejandro R Sedeño <asedeno@google.com>
Thu, 4 Apr 2013 02:27:17 +0000 (22:27 -0400)
commitb79028eb511bf6c4fb4a06593e3ea424f9855c81
tree1ef8be41fea0befb15d873f14760b9f506f1aeae
parent3a4cd0e3bfa61aa9aa29f4ce7238c4069cc52f51
parentd3a181415de9bead0b08207df223d2e59b3fe9cc
Merge branch 'master' into doc-strings

Conflicts:
src/mysql-protocol/handshake.lisp
src/wire-protocol/compressed-protocol.lisp
src/mysql-protocol/handshake.lisp
src/wire-protocol/compressed-protocol.lisp