Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x
authorZach Copley <zach@controlyourself.ca>
Tue, 14 Jul 2009 17:43:13 +0000 (10:43 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 14 Jul 2009 17:43:13 +0000 (10:43 -0700)
commitb05b998d68ab2d4802ed4ec96abec59332ffe354
tree13b71eaf106b269f06dc29b221418f441067995d
parent783231c32739cf892cc23a11376c0f67810feb69
parentc97957cf3e42b88f345408cd6d399bfe2da27f84
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x

* '0.8.x' of git@gitorious.org:laconica/mainline:
  HTML "File"/attachments should probably not be considered enclosures.
  Moved the decision logic as to whether an attachment should be an enclosure to the File class