0000000000000000000000000000000000000000 473c583ca61b2191c1529ea731a71af5eff23329 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1241047998 -0300	clone: from git@code.openbossa.org:canola/mainline.git
473c583ca61b2191c1529ea731a71af5eff23329 8e3f4cd803f1501b619f7606ddfc2787906848d6 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242238868 -0300	rebase finished: refs/heads/master onto 8e3f4cd803f1501b619f7606ddfc2787906848d6
8e3f4cd803f1501b619f7606ddfc2787906848d6 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242243411 -0300	rebase -i (finish): refs/heads/master onto 473c583)
b8b38833c460630232e1f823ea32761ce7728ab8 9eb1f9342705115c4c6c6d58d9425728044286d9 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242245176 -0300	HEAD^: updating HEAD
9eb1f9342705115c4c6c6d58d9425728044286d9 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242248273 -0300	origin/master: updating HEAD
b8b38833c460630232e1f823ea32761ce7728ab8 07f49ca45afbc43d0275dff41b164522cc353f7a Eduardo Lima (Etrunko) <etrunko@etrunko-desktop.(none)> 1242249940 -0300	commit: Images: Catch exception when trying to convert encoding
07f49ca45afbc43d0275dff41b164522cc353f7a 4a904380cda186149fbd3dfd7ec6aab399a5c68a Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250097 -0300	commit (amend): Images: Catch exception when trying to convert encoding
4a904380cda186149fbd3dfd7ec6aab399a5c68a 835aa3f573e643d68502068c80c243b05de6a5be Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250122 -0300	commit (amend): Images: Catch exception when trying to convert encoding
835aa3f573e643d68502068c80c243b05de6a5be e0b27d655c94de44920b1f02d121c312d0b52f58 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250201 -0300	commit (amend): Images: Catch exception when trying to convert encoding
e0b27d655c94de44920b1f02d121c312d0b52f58 b8b38833c460630232e1f823ea32761ce7728ab8 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250249 -0300	HEAD^: updating HEAD
b8b38833c460630232e1f823ea32761ce7728ab8 7c3df88780369daade8ecd922709e78d6a0bfb15 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242250253 -0300	commit: Images: Catch exception when trying to convert encoding
7c3df88780369daade8ecd922709e78d6a0bfb15 25a7f99e04dd756bf1279535467871149d333941 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242327827 -0300	commit: Use proper terra function to handle encoding
25a7f99e04dd756bf1279535467871149d333941 eb622e32e9775d2c8210a6521c7740e16e4dd238 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1242332395 -0300	commit: Images: Hide/Show back and options buttons in/out slideshow mode
eb622e32e9775d2c8210a6521c7740e16e4dd238 f3c4e5c78dae825e86a4a89b514b19995f41141d Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243759608 +0200	commit: Added additional permission to the license under GPLv3 section 7
f3c4e5c78dae825e86a4a89b514b19995f41141d 8b1b6ccf19b19c3ab93a9ee209f68b820142b90e Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243761493 +0200	commit (amend): Added additional permission to the license under GPLv3 section 7
8b1b6ccf19b19c3ab93a9ee209f68b820142b90e 42017b079f10c0634a6a4774bd61821fcb69609b Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243769645 +0200	commit: Photocast: Added missing method to SettingsPhotocastModelFolder
42017b079f10c0634a6a4774bd61821fcb69609b 9930c78d207d8bcf83ff50c4aba227475c40d673 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1243783622 +0200	commit: Multitask: Reset model state_reason befor unrefing the controller
9930c78d207d8bcf83ff50c4aba227475c40d673 9f63091ce0dffee842dce649dfc4c423b3a85834 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1248121978 -0300	merge andrei/master: Merge made by recursive.
9f63091ce0dffee842dce649dfc4c423b3a85834 2b57647876ac693d881caf94797a49f6608ec0af Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1250980605 -0300	commit: Themes: Imported "official" themes
2b57647876ac693d881caf94797a49f6608ec0af 24e2ba3f1532dc83d8dab962d24b4a7ea17848b9 Eduardo Lima (Etrunko) <eduardo.lima@openbossa.org> 1250981224 -0300	rebase finished: refs/heads/master onto 626781f0b29f0fb0a1a278e0220237e8a68338d8
