Merge branch 'master' of git+ssh://projects.mako.cc/git/iron-blogger

Conflicts:
	ledger

diff --git a/bloggers.yml b/bloggers.yml
index 46635f39a8856acfa5aadd557c5edad0e8e84a61..5584163c7a44867d968cae003c6596afb7bd2cce 100644 (file)
--- a/bloggers.yml
+++ b/bloggers.yml
@@ -85,7 +85,6 @@ jeff:
   - [Jeff Warren (Public Laboratory), 'http://publiclaboratory.org/', 'http://publiclaboratory.org/feed/1']
   start: 2011-11-28
 johns:
-  end: 2013-02-04
   links:
   - [John Sullivan, 'http://journal.wjsullivan.net', 'http://feeds.feedburner.com/wjsullivan']
   start: 2011-11-14
@@ -100,7 +99,6 @@ kendra:
   - [Kendra Albert, 'http://www.kendraalbert.com/', 'http://www.kendraalbert.com/rss']
   start: 2012-09-17
 lombana:
-  end: 2013-01-07
   links:
   - [Andres Lombana Bermudez, 'http://andreslombana.net/blog/', 'http://andreslombana.net/blog/?feed=rss2']
   start: 2011-11-14
@@ -116,7 +114,6 @@ mako:
   - [Benjamin Mako Hill, 'http://mako.cc/copyrighteous/', 'http://mako.cc/copyrighteous/?flav=atom']
   start: 2011-10-31
 mattl:
-  end: 2012-12-03
   links:
   - [Matt Lee, 'http://lttam.wordpress.com/', 'http://feeds.feedburner.com/metamattl/rss']
   - [Matt Lee (All About Matt), 'http://mattl.wpengine.com/', 'http://feeds.feedburner.com/allaboutmatt']

diff --git a/ledger b/ledger
index 5f1c762270e222836d856c11555ec36588a80233..460194dd591122f7a6a7706ee2512dce730caefe 100644 (file)
--- a/ledger
+++ b/ledger
@@ -1637,7 +1637,7 @@
 
 2012-08-06 Unpunt
   Pool:Owed:epopko     30
-  User:edpopko
+  User:epopko
 2012-08-06 Payment 
   Pool:Owed:epopko     -30
   Pool:Paid
@@ -2123,9 +2123,6 @@
   Pool:Owed:mattl  -35.0
   User:mattl
 
-2013-01-14 Fine Week 63
-  User:lombana    -5
-  Pool:Owed:lombana
 2013-01-14 Fine Week 63
   User:mad    -5
   Pool:Owed:mad
@@ -2139,10 +2136,6 @@
   User:vaughn    -5
   Pool:Owed:vaughn
 
-2013-01-07 Punt
-  Pool:Owed:lombana  -35.0
-  User:lombana
-
 2013-01-21 Fine Week 64
   User:amos    -5
   Pool:Owed:amos
@@ -2309,3 +2302,23 @@
 2012-02-19 Payment
   Pool:Owed:johns    -30
   Pool:Paid
+
+2013-02-19 Unpunt
+  User:mattl     -30
+  Pool:Owed:mattl
+2012-02-19 Payment
+  Pool:Owed:mattl    -30
+  Pool:Paid
+
+2013-02-19 Paella Ingredients
+  Pool:Paid     -68.00
+  Events
+2013-02-19 Beer
+  Pool:Paid     -73.50
+  Events
+2013-02-19 Pizza from Mike's
+  Pool:Paid     -36.15
+  Events
+2013-02-19 Adjustment Down (Cash from Non-Participants)
+  Pool:Paid     15
+  Events