Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:27:15 +0000 (19:27 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:27:15 +0000 (19:27 -0800)
commitcb943a2ff3ab33d050ce0d6b4cee5614c0d3d7a1
treec7f31b7c643764e695ce924bfafe71c37a35adf4
parentb75362f5cb7a943da0dcb10a6571584d0d78bbc8
parentc01010387a0c1d4d71de55f2957800337c00264d
Merge remote-tracking branch 'origin/master' into type-nats