commit | 64475bc55f74eac1d20fc335fa92c9145977b534 | [log] [tgz] |
---|---|---|
author | Vinayak Borkar <vinayakb@gmail.com> | Tue May 28 09:48:21 2013 -0700 |
committer | Vinayak Borkar <vinayakb@gmail.com> | Tue May 28 09:48:21 2013 -0700 |
tree | d63b5f3fb262951861ddc4e84be6c1573050b811 | |
parent | 263ddb0b16b128033704a3cf74ae868890ed36ac [diff] | |
parent | b43b76298d87880c6a738d5238c094e8acfdc7b4 [diff] |
Merge branch 'master' into vinayakb/resource_management