projects / cloudstore.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6ef4e8 cc416fc)
Merge branch 'master' of git.rot13.org:/git/cloudstore
authorDobrica Pavlinusic <dpavlin@rsync1.maxxo.com>
Sun, 12 Feb 2012 20:07:17 +0000 (21:07 +0100)
committerDobrica Pavlinusic <dpavlin@rsync1.maxxo.com>
Sun, 12 Feb 2012 20:07:17 +0000 (21:07 +0100)
Conflicts:
lib/WarnColor.pm


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.