Merge remote-tracking branch 'allan/working'
commitdfaeb6bb2ca8311ac418a16c30006eb7d0534d71
authorDan McGee <dan@archlinux.org>
Wed, 8 Jun 2011 07:49:09 +0000 (8 02:49 -0500)
committerDan McGee <dan@archlinux.org>
Wed, 8 Jun 2011 07:49:09 +0000 (8 02:49 -0500)
tree227f127eb1a35e20689b1b60b4dbe5255c7e9a7f
parent11ba7a0e8a253bff53778688ee174f42c1513738
parent87072ff63907ce6040be7e59b9b07fd891a8254a
Merge remote-tracking branch 'allan/working'