Merge branch 'stable-2.8' into stable-2.9
authorKlaus Aehlig <aehlig@google.com>
Mon, 24 Feb 2014 13:42:49 +0000 (14:42 +0100)
committerKlaus Aehlig <aehlig@google.com>
Mon, 24 Feb 2014 13:47:49 +0000 (14:47 +0100)
* stable-2.8
  Fix expression describing optional parameters

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Jose A. Lopes <jabolopes@google.com>

1  2 
lib/objects.py

diff --cc lib/objects.py
Simple merge