madz 1e16540932 Merge branch 'master' into cephPlugin ...

Conflicts:
	plugins/all/all.go

2015-07-01 11:09:14 +08:00

..

all.go

Merge branch 'master' into cephPlugin

2015-07-01 11:09:14 +08:00