Merge branch 'master' of ssh://butterfat.net/home/greggmc/Braintube
authorMatthew Gregg <matthew.gregg@livingsocial.com>
Wed, 19 Feb 2014 16:51:19 +0000 (11:51 -0500)
committerMatthew Gregg <matthew.gregg@livingsocial.com>
Wed, 19 Feb 2014 16:51:19 +0000 (11:51 -0500)
commit66efbc45711d1cae7ee322915b80faccd8579885
tree1ca9a98c798fb2cc5634cda61b0095fd2b75a94a
parent333ff2480c4f5d3ea97a2d169dbf8f890a8acaf8
parenta0f74ad555d22e0f6d67a3ab2b4633c6f79a07d7
Merge branch 'master' of ssh://butterfat.net/home/greggmc/Braintube

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.