Merge branch 'devel-2.4' into stable-2.4
authorIustin Pop <iustin@google.com>
Mon, 28 Feb 2011 13:30:45 +0000 (14:30 +0100)
committerIustin Pop <iustin@google.com>
Mon, 28 Feb 2011 14:08:37 +0000 (15:08 +0100)
commitde039dd451462cb83f63e1d995082e13e98fcaa8
tree7369e650134fbd1405ef661f61eb4389ecc10160
parent4ecb94d5e2260fae6a1084e02ad74f91ac4ba32c
parent73f1d18564ab2d9d470ef25df5c2ba035813bb3e
Merge branch 'devel-2.4' into stable-2.4

* devel-2.4:
  1-char comment typo fix
  Expand some acronyms, add to glossary
  query_unittest: Fix argument to set()

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenĂ© Nussbaumer <rn@google.com>