tree bab082d352f1737faa28f6c5d81bf75e872b06cb
parent 2368793def627478574180ed5cade747efa0154f
parent eb6ee6f84d0a848c7f11b46cd11f28875ba56b1c
author Gustavo Niemeyer <gustavo@niemeyer.net> 1396315334 -0300
committer Gustavo Niemeyer <gustavo@niemeyer.net> 1396315334 -0300

Merge from trunk.