From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Wed, 11 Apr 2012 16:54:22 +0000 (+0200)
Subject: Merge branch 'master' of git.rot13.org:/git/cloudstore
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=f60e030a70afd8803da9daeca58561058a78d232;p=cloudstore.git

Merge branch 'master' of git.rot13.org:/git/cloudstore

Conflicts:
	t/API.t
---

f60e030a70afd8803da9daeca58561058a78d232
diff --cc t/API.t
index 7a22ef8,0b31f9c..ecfe29a
--- a/t/API.t
+++ b/t/API.t
@@@ -2,7 -2,7 +2,7 @@@
  use strict;
  use warnings;
  
- use Test::More tests => 25;
 -use Test::More tests => 27;
++use Test::More tests => 26;
  use Data::Dump qw(dump);
  
  use lib 'lib';