Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Mon, 14 Dec 2009 20:25:57 +0000 (15:25 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 14 Dec 2009 20:25:57 +0000 (15:25 -0500)
commita93b00a5e93281c7c2c31112f0b6b827d605a19d
tree92c786a617a3dc755c633eeb8c5410407a258fbf
parentacafa38c8ea210b12ed92fc16281b915ab61542c
parentf3e553446fdcfc04f26ea25396a138965c4a999d
Merge branch 'backport' into work
.gitignore
Makefile.am
data/rc.xml