{"shas":[["b7e780afb8e4af16a1b8e284434a445ee3c072c9","e69bf4dbe67fc05fea20727a3393d477e6446a83@gmail.com","changed dbtest so that it uses Task object.  Added documentation to SQLiteHelper. Changed documentation in createDatabase.js.","Masud Khan"],["08945c44ebc036e8cbbf2e32285a284307b12837","e69bf4dbe67fc05fea20727a3393d477e6446a83@gmail.com","Merge remote branch 'upstream/master'\n\nConflicts:\n\tjs/SQLiteHelper.js\n\tstatic/js/task.js\n\ttests/dbtest/dbtest.js","Masud Khan"],["5b7b7365e28a4ba33fb7201756dce248d45c22f5","7f28c082beb6736f56ae294f659af65d84e1d556@ucalgary.ca","Merge branch 'master' of git://github.com/akromm/CourseProject into ak","Shaun Phillips"],["5f5ab862cc6477263177b66a3bb9868a8491767a","92f19bca85a6d2e08a3a9d99331dd3fb25ae402e@ucalgary.ca","Merge remote branch 'upstream/master'","Cindy"]],"repo":"loo-cindy/CourseProject","actor":"loo-cindy","ref":"refs/heads/master","size":4,"head":"5f5ab862cc6477263177b66a3bb9868a8491767a","actor_gravatar":"bdf7463e3cc776b17b95a52f6a9f2085","push_id":26277180}