{"shas":[["7676b7e5aa82e7199a8d92467d1cc9bb47e8f119","c23f1c5a369c27db2d5e3b3304c8c73b79721154@indiAir.(none)","commit","Tamias"],["f17d16851dbaf9fa93a1a65606d6a62f0fb36197","c23f1c5a369c27db2d5e3b3304c8c73b79721154@indiAir.(none)","Merge branch 'master' of github.com:Maigre/EnergyWatch\n\nConflicts:\n\tapplication/controllers/data/uploadxls.php","Tamias"]],"ref":"refs/heads/master","size":2,"head":"f17d16851dbaf9fa93a1a65606d6a62f0fb36197","push_id":42686544}