tree b17c5eda9c731181cb0688ed5000b48cc69f7f47
parent d87337d8f9f8dcdb0a416b7cdc94c927b36b0e0e
parent a7417cf75d68689ea0bc275f0062fc90d7a5afd1
author Shawn Pearce <sop@google.com> 1373074519 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1373074519 +0000

Merge "PrettyFormatter: Fix expand tab when syntax coloring is on." into stable-2.6