Andrew Johnson ffcbd4ca8b Merge changes from 3.14.12.5 (revno 12582)

2015-03-25 12:53:13 -05:00

..

client

Merge changes from 3.14.12.5 (revno 12582)

2015-03-25 12:53:13 -05:00

legacy

Merged changes from 3.14 branch, revno 12514

2015-02-04 11:43:23 -06:00