Andrew Johnson 43ea188385 Merge 3.15 branch into 3.16 ...

# Conflicts:
#	configure/CONFIG_BASE
#	configure/RULES_BUILD

2017-05-18 17:10:40 -05:00

..

gdd

Merged changes from 3.14 branch to revno 12687

2016-12-07 16:36:58 -06:00

pcas

Merge 3.15 branch into 3.16

2017-05-18 17:10:40 -05:00