Merge pull request #130 from njy/patch-1
authorJan Kotas <jkotas@microsoft.com>
Sat, 7 Feb 2015 17:15:06 +0000 (09:15 -0800)
committerJan Kotas <jkotas@microsoft.com>
Sat, 7 Feb 2015 17:15:06 +0000 (09:15 -0800)
possible unresolved tension


Trivial merge