Merge remote-tracking branch 'origin/master' slapos-0.145
authorMarco Mariani <marco.mariani@nexedi.com>
Tue, 29 Jan 2013 14:36:21 +0000 (15:36 +0100)
committerMarco Mariani <marco.mariani@nexedi.com>
Tue, 29 Jan 2013 14:36:21 +0000 (15:36 +0100)
commit5debe3fbe7062296e75f50076ba98af20914183b
tree8f9004d58837bf48db7f6af3b3763d5803a0b4f9
parent8bfcc14c36cead7f45795c4d0a1da5d46b4bd4ae
parent90bedb8e1c40bf3bd78acdb50bf161a4fb96250d
Merge remote-tracking branch 'origin/master'