Merge branch 'master' of git.rot13.org:/git/BackupPC into hospira
authorDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 20 Feb 2011 12:06:00 +0000 (13:06 +0100)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Sun, 20 Feb 2011 12:06:00 +0000 (13:06 +0100)

Trivial merge