Merge branch 'simplelog'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 7 Feb 2013 02:32:19 +0000 (02:32 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 7 Feb 2013 02:32:19 +0000 (02:32 +0000)
commit6073c6e24b3fbc670e16fdeeabb7faf1878c3e26
tree4a3b8eb0d3531e96d5e0dd9af852996861a7f5d7
parent08c85badc04c7f4a052fa45ea24dfd8f1dbd556c
parent0359670659dee4163d274a3ddd2616dd5e06db51
Merge branch 'simplelog'