commit df97cbe160b65d32cf9708506b92c2a1639d1f1f
parent 7620efa754df5427adee1556742589b216e2adbb
Author: Rich Lane <rlane@club.cc.cmu.edu>
Date: Thu, 3 Jun 2010 20:38:14 -0700
Merge branch 'master' into next
Conflicts:
lib/sup/source.rb
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/sup/source.rb b/lib/sup/source.rb
@@ -59,7 +59,7 @@ class Source
## Examples for you to look at: mbox/loader.rb, imap.rb, and
## maildir.rb.
- bool_reader :usual, :archived
+ bool_accessor :usual, :archived
attr_reader :uri
attr_accessor :id