Merge remote branch 'origin/4.8' into doc-staging-master
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 19 Sep 2011 04:12:35 +0000 (14:12 +1000)
committerRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 19 Sep 2011 04:12:35 +0000 (14:12 +1000)
commit5055f13683dd0670d62a81e61bf097fd220f0d42
tree1cf10d701b6d6ba5fffe9a2267ecf894d505e1bd
parentfc602cb1737e58b4b814c4a799fa2a68acb6dbcd
parent53d9e3620ede7492c141402d9365d5c0dd7c10fd
Merge remote branch 'origin/4.8' into doc-staging-master

Conflicts:
dist/changes-4.8.0
dist/changes-4.8.0