Merge remote-tracking branch 'google/feature/#80-configurable-include-path' into...
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 27 Mar 2014 01:09:49 +0000 (01:09 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Thu, 27 Mar 2014 01:09:49 +0000 (01:09 +0000)

Trivial merge