Merge remote-tracking branch 'google/bugfix/#77-@GFLAGS_IS_A_DLL@-expands-to-empty...
authorAndreas Schuh <andreas.schuh.84@gmail.com>
Wed, 26 Mar 2014 19:33:24 +0000 (19:33 +0000)
committerAndreas Schuh <andreas.schuh.84@gmail.com>
Wed, 26 Mar 2014 19:33:24 +0000 (19:33 +0000)

Trivial merge