merge with 3.2

This commit is contained in:
Sandro Tosi 2012-03-31 17:44:33 +02:00
commit dc60f940b5

View file

@ -137,6 +137,8 @@ for the controller classes, all defined in this module.
+------------------------+-----------------------------------------+-------+
| ``'macosx'`` | :class:`MacOSX('default')` | \(4) |
+------------------------+-----------------------------------------+-------+
| ``'safari'`` | :class:`MacOSX('safari')` | \(4) |
+------------------------+-----------------------------------------+-------+
| ``'google-chrome'`` | :class:`Chrome('google-chrome')` | |
+------------------------+-----------------------------------------+-------+
| ``'chrome'`` | :class:`Chrome('chrome')` | |