merge heads

This commit is contained in:
Andrew Svetlov 2012-10-17 17:33:26 +03:00
commit 1e9af84e2e

4416
Misc/NEWS

File diff suppressed because it is too large Load diff