Merge upstream 2.1.2#17

Merged

dbussink merged 23 commits into2.1from

merge-upstream-2.1.2

May 12, 2014

Commits on Feb 24, 2014

Commits on Mar 1, 2014

Commits on May 1, 2014

merge revision(s) r45225,r45240,r45488: [Backport #9578] [Backport #9630]
nagachika
committed
merge revision(s) r45518: [Backport #9578] [Backport #9630] [Backport #9702]
nagachika
committed
merge revision(s) r45271: [Backport #9592] [Backport #9671]
nagachika
committed

Commits on May 4, 2014

Commits on May 5, 2014

merge revision(s) r45760: [Backport #9796]
nagachika
committed

Commits on May 7, 2014

Commits on May 8, 2014

add tag v2_1_2
nagachika
committed

Commits on May 10, 2014

Merge tag 'v2_1_2' into merge-upstream-2.1.2
dbussink
committed

Commits on May 12, 2014

Cleanup Changelog merge lines
dbussink
committed