<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -2,6 +2,8 @@
   $.fn.tweet = function(o){
     var s = {
       username: &quot;seaofclouds&quot;,                // [string]   required, unless you want to display our tweets. :)
+			show_user: false,									  		// [Boolean]  show user name in tweet?
+			avatar_size: 32,												// [integer]  height and width of avatar if displayed
       count: 1,                               // [integer]  how many tweets to display?
       intro_text: null,                       // [string]   do you want text BEFORE your your tweets?
       outro_text: null,                       // [string]   do you want text AFTER your tweets?
@@ -41,7 +43,10 @@
       var intro = '&lt;p class=&quot;tweet_intro&quot;&gt;'+s.intro_text+'&lt;/p&gt;'
       var outro = '&lt;p class=&quot;tweet_outro&quot;&gt;'+s.outro_text+'&lt;/p&gt;'
       var loading = $('&lt;p class=&quot;loading&quot;&gt;'+s.loading_text+'&lt;/p&gt;');
-      var url = 'http://search.twitter.com/search.json?q=from%3A'+s.username+'&amp;rpp='+s.count+'&amp;callback=?'
+			if(typeof(s.username) == &quot;string&quot;){
+				s.username = [s.username];
+			}
+      var url = 'http://search.twitter.com/search.json?q=from:'+s.username.join('%20OR%20')+'&amp;rpp='+s.count+'&amp;callback=?';
       if (s.loading_text) $(this).append(loading);
       $.getJSON(url,  function(data){
         if (s.loading_text) loading.remove();
@@ -61,11 +66,11 @@
               var join_text = s.auto_join_text_default;
             }
           } else {
-            var join_text = s.join_text
+            var join_text = s.join_text;
           };
-          var join = '&lt;span class=&quot;tweet_join&quot;&gt; '+join_text+' &lt;/span&gt;'
-          
-          list.append('&lt;li&gt;&lt;a href=&quot;http://twitter.com/'+s.username+'/statuses/'+item.id+'&quot; title=&quot;view tweet on twitter&quot;&gt;'+relative_time(item.created_at)+'&lt;/a&gt;'+ ((s.join_text) ? join : ' ') + '&lt;span class=&quot;tweet_text&quot;&gt;' + item.text.replace(/(\w+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&amp;\?\/.=]+)/gi, '&lt;a href=&quot;$1&quot;&gt;$1&lt;/a&gt;').replace(/[\@]+([A-Za-z0-9-_]+)/gi, (s.join_text == &quot;auto&quot;) ? '&lt;a href=&quot;http://twitter.com/$1&quot;&gt;@$1&lt;/a&gt; with ' : ' ').replace(/[\#]+([A-Za-z0-9-_]+)/gi, '&lt;a href=&quot;http://search.twitter.com/search?q=&amp;tag=$1&amp;lang=all&amp;from='+s.username+'&quot;&gt;#$1&lt;/a&gt;').replace(/[&amp;lt;]+[3]/gi, &quot;&lt;tt class='heart'&gt;&amp;#x2665;&lt;/tt&gt;&quot;) + '&lt;/span&gt;&lt;/li&gt;');
+          var join = '&lt;span class=&quot;tweet_join&quot;&gt; '+join_text+' &lt;/span&gt;';
+
+          list.append('&lt;li&gt;'+(s.show_user ? '&lt;a href=&quot;http://twitter.com/'+ item.from_user+'&quot;&gt;&lt;img class=&quot;tweet_avatar&quot; src=&quot;'+item.profile_image_url+'&quot; height=&quot;'+s.avatar_size+'&quot; width=&quot;'+s.avatar_size+'&quot; alt=&quot;avatar&quot;/&gt;&lt;/a&gt;' : '')+'&lt;a href=&quot;http://twitter.com/'+item.from_user+'/statuses/'+item.id+'&quot; title=&quot;view tweet on twitter&quot;&gt;'+relative_time(item.created_at)+'&lt;/a&gt;'+ ((s.join_text) ? join : ' ') + '&lt;span class=&quot;tweet_text&quot;&gt;' + item.text.replace(/(\w+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&amp;\?\/.=]+)/gi, '&lt;a href=&quot;$1&quot;&gt;$1&lt;/a&gt;').replace(/[\@]+([A-Za-z0-9-_]+)/gi, (s.join_text == &quot;auto&quot;) ? '&lt;a href=&quot;http://twitter.com/$1&quot;&gt;@$1&lt;/a&gt; with ' : '&lt;a href=&quot;http://twitter.com/$1&quot;&gt;@$1&lt;/a&gt;').replace(/[\#]+([A-Za-z0-9-_]+)/gi, '&lt;a href=&quot;http://search.twitter.com/search?q=&amp;tag=$1&amp;lang=all&amp;from='+s.username.join(&quot;%2BOR%2B&quot;)+'&quot;&gt;#$1&lt;/a&gt;').replace(/[&amp;lt;]+[3]/gi, &quot;&lt;tt class='heart'&gt;&amp;#x2665;&lt;/tt&gt;&quot;) + '&lt;/span&gt;&lt;/li&gt;');
         });
         $('.tweet_list li:odd').addClass('tweet_even');
         $('.tweet_list li:even').addClass('tweet_odd');</diff>
      <filename>javascripts/jquery.tweet.js</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>190c85bca6ea6492953909623e58513f831606c5</id>
    </parent>
  </parents>
  <author>
    <name>Wynn Netherland</name>
    <email>wynn@squeejee.com</email>
  </author>
  <url>http://github.com/seaofclouds/tweet/commit/0b499ded129d16970baca73d9a78c04d37894036</url>
  <id>0b499ded129d16970baca73d9a78c04d37894036</id>
  <committed-date>2008-11-12T19:42:34-08:00</committed-date>
  <authored-date>2008-11-12T19:42:34-08:00</authored-date>
  <message>Multi user support</message>
  <tree>4fd4c2940b00b885a1a9e82bcb6bf228d178a05e</tree>
  <committer>
    <name>Wynn Netherland</name>
    <email>wynn@squeejee.com</email>
  </committer>
</commit>
