ref: 9347ef0944f6076bd5f016e85b2627f519bd51a9
parent: 928508eccd9699691f7ef41f508b669953e60b06
parent: 8b47bd6c54891baebf6a1083c7b1f6fa0402b8e4
author: Roberto E. Vargas Caballero <k0ga@shike2.com>
date: Mon Sep 28 06:32:18 EDT 2015
Merge remote-tracking branch 'origin/master' Conflicts: cc1/tests/test001.c cc1/tests/test004.c cc1/tests/test005.c cc1/tests/test006.c cc1/tests/test007.c cc1/tests/test008.c cc1/tests/test009.c cc1/tests/test010.c cc1/tests/test011.c cc1/tests/test012.c cc1/tests/test017.c cc1/tests/test018.c