tree fc24f6ddd590cb88cc989285207f0c8b0a4df902
parent 3e67bc4590736393c06ed2bc530af47cfdecc8b1
parent ff9010e2872e63fe396d77a5fd9944951ea61407
author Till Westmann <till@westmann.org> 1383939133 -0800
committer Till Westmann <till@westmann.org> 1383939133 -0800

Merge branch 'raman/master/cluster_active_wait' into westmann/scratch