resolving merge conflict by adding both requirements.
authorBryan <btbonval@gmail.com>
Fri, 20 Dec 2013 23:51:18 +0000 (18:51 -0500)
committerBryan <btbonval@gmail.com>
Fri, 20 Dec 2013 23:51:18 +0000 (18:51 -0500)
commitcffefd75a2cffa50fa7f01d34f021dadd3296d65
treef5225becd917075563411a2826abeb7387c33583
parente8edb856a532bd36c318ac044ed303869d30af7c
parent11fab47b43b436a35f17b12691dbcca9d1f4c811
resolving merge conflict by adding both requirements.