Merge remote branch 'remotes/elrond/idea/use_media_url_for_self'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 10 Sep 2011 22:42:50 +0000 (17:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Sat, 10 Sep 2011 22:42:50 +0000 (17:42 -0500)
commit55376ff403496a3271154627c45fe59dc2b44ca7
tree971f150b1c836c0213e8880b6b69d2f37e20039d
parent0125e5567bfa71e47d79fa02acbe7f66c0c8bec7
parent8d7b549bb6d17c66ce1d3590da6e9bd0868b4403
Merge remote branch 'remotes/elrond/idea/use_media_url_for_self'