Merge pull request #304 from cdunn2001/297
authorChristopher Dunn <cdunn2001@gmail.com>
Sat, 11 Jul 2015 16:08:47 +0000 (11:08 -0500)
committerChristopher Dunn <cdunn2001@gmail.com>
Sat, 11 Jul 2015 16:08:47 +0000 (11:08 -0500)
commitb26804d1c217eced84ab57cbffe8a0baf4db8f9f
tree4b7f24ac97be0e3e519d006f183a63aab9d6c764
parentd259f608fd2a52f94f9e5fa470cc8dc98dde8bb9
parent702a53976260608c4497d99f00f01ff55aff7791
Merge pull request #304 from cdunn2001/297

Same as #297 (1c4f274ab32594d717fc442a0f8a68d9e7633637), but properly rebased