tree d599e1fce65ea42f1dfb39a466c8a91d331aab48
parent 80455263858b9911eab4d678d286fde5caad68b0
parent 64a036de313ea5df8a2fe9dc8865ce639b445257
author Pankaj Berde <pankaj@onlab.us> 1389816273 -0800
committer Pankaj Berde <pankaj@onlab.us> 1389816273 -0800

Merge pull request #530 from jonohart/titan

Upgraded to Titan 0.4.2 (plus Frames 2.4.0 and Blueprints 2.4.0)