{"push_id":618528767,"size":5,"distinct_size":1,"ref":"refs/heads/ready/adam","head":"d72157dee733c6615affa2493248f2a00763bba0","before":"f91e2620811dd2d0b232729312ee98d41988b456","commits":[{"sha":"d03b16aa7aa29aa267aa8bac522a1cfd8ae33d5b","author":{"email":"98b2e78111f5fb1e04bdf1ad40a8514a5123442b@praqma.com.com","name":"gijeli-slave"},"message":"Squashed commit of the following:\n\ncommit 8424733cb098a99c43371c78b340c9959b85a285\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 11:52:05 2015 +0100\n\n    no message\n\ncommit cfddaae29eca6191bf5ec8e9c3f607c27cef4903\nMerge: 980ffed b0ae518\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 11:51:05 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 980ffeda0159fa873518e9de343cae15f4d4e8ec\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 11:40:27 2015 +0100\n\n    no message\n\ncommit 6dceab4305622e6abeb1add319c260e3d630e9e2\nMerge: 03eec32 9cfba6c\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 11:40:06 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 03eec32da530c1e3f41deaae400079c18b007b56\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 09:26:50 2015 +0100\n\n    Atmel abstract\n\ncommit ad63753d20558733e7956141147d3d37a764e46f\nMerge: e63174d f03044a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 18 09:26:13 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit e63174d79e84eddff6c9eed1f589e0bd4d814291\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 16:57:55 2015 +0100\n\n    no message\n\ncommit a5e5f9b3fa52ee2a804e76172b19e4297706f8d1\nMerge: f6d98ec 992fbb4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 16:57:19 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit f6d98ec89dc87b98a5aee3ba1244130d13b44d99\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 11:19:44 2015 +0100\n\n    no message\n\ncommit 94d28d1e25a2edc665c0b19f698bf6be7c1e83b0\nMerge: d220fb6 c0e527e\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 11:17:51 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit d220fb6b58dbb11043919fc1747e9ec526953de8\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 10:53:31 2015 +0100\n\n    no message\n\ncommit 108b7feadd8a44302afa7d663c281e1c570e7e30\nMerge: b6014b4 d2a130c\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 10:53:11 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit b6014b4e7c807c1876f355437be790a270093863\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 10:48:59 2015 +0100\n\n    no message\n\ncommit 268386e8f84e82aef254bf6a5f440e9adfa7b0e9\nMerge: f8b04db 115e997\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 10:35:41 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit f8b04dbaedb2e13b63b1c9b03ed7e7f3c993719d\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 09:33:55 2015 +0100\n\n    no message\n\ncommit cbc82496d3bf5762224971cf2845a22777cacea3\nMerge: a55428e e9f7e23\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 09:32:49 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit a55428e479900844fbb6f73dd04ed9277379dac9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 09:14:40 2015 +0100\n\n    Atmel speak\n\ncommit ed81a1da6033087af459954e3e2b3461b1382e5c\nMerge: 80d4686 58805e4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 09:13:47 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 80d4686f4febab48ca4323971cf259284f4a5a4e\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 08:56:17 2015 +0100\n\n    no message\n\ncommit 222c32d57e2123efac3c19ef2ba3f8dc6027cbee\nMerge: 392f856 97be78f\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 17 08:48:21 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 392f856e4d76a2ab7b072b76fdbcafdabab24a31\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Mar 16 16:04:59 2015 +0100\n\n    no message\n\ncommit 2e434da7848c62c803045b78d4596471970c647e\nMerge: ce0d1f9 3b372f1\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Mar 16 16:04:41 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit ce0d1f97b34fd8b7c1198d26b4457c0add4cb421\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Mar 16 15:56:53 2015 +0100\n\n    CA keynote\n\ncommit dc6ea37a9ea5e9a5f0e3db73de8e89a2b4c27137\nMerge: 8c25273 57be1df\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Mar 16 15:50:26 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 8c25273eabeb8f92bc8f5b3b33e3dd994576e2ee\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 13 15:56:32 2015 +0100\n\n    no message\n\ncommit 1e7f72678e47319e2a551c8551b1f270348571ad\nMerge: 6958497 c771a50\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 13 15:56:10 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 695849783bc98cab4f921336c7c34a55340eae24\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Mar 12 10:51:01 2015 +0100\n\n    no message\n\ncommit 8f7fc730a07ff365cef84b448ce87270e8def543\nMerge: 5f5492d 544a05a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Mar 12 10:49:55 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 5f5492d220dc45e319b18ee688720c9cccc0e80d\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 17:32:10 2015 +0100\n\n    Pardeep Sandhu\n\ncommit 2704cd27a77b2b74133f5a7662bbfa5262918995\nMerge: 773219f 4be47c4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 17:31:50 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 773219fec88c03c673a1c8a3a6dc4c2e84a93c61\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 14:21:53 2015 +0100\n\n    no message\n\ncommit 9e3b55a2600c6a60c54734255eb0cac5f43fdfc3\nMerge: b517222 0e353bf\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 14:21:33 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit b5172222496702645b83fb4ae92b3c7195dd67e3\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 13:54:44 2015 +0100\n\n    no message\n\ncommit 794f84bcc712e1100ab35b36d1df66a919639be4\nMerge: 541a6fc 43a5349\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 13:54:00 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 541a6fc12cfc709212cb6c9710b369a3d46a4ae9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 12:41:15 2015 +0100\n\n    Agenda\n\ncommit 3beb78d0c38437914b5d46da8129b30f7cf7e621\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 12:33:03 2015 +0100\n\n    no message\n\ncommit d948e6fe29e155e4e644a7766556c271aeef6be2\nMerge: 9c53370 223fb82\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 12:32:45 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 9c533708971cd70a664696e9dcaa7b794d4e8d22\nMerge: 600e614 7e684d7\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 10:37:38 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\n    Conflicts:\n    \tspeakers/index.md\n\ncommit 600e614c9a123dd2594e5b55c4b4690e5449750f\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 10:35:52 2015 +0100\n\n    no message\n\ncommit 63e08d4726db90711eaf127baff2bc6eae6fc96b\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 10:07:16 2015 +0100\n\n    no message\n\ncommit 5ff25eeed3c74a53fa51f17824c86f3cc6494ab5\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 10:03:41 2015 +0100\n\n    no message\n\ncommit 20cf3e0bf8c8c9a93cd08df41a44425010b6f800\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 10:03:16 2015 +0100\n\n    no message\n\ncommit 5ddd4948dfcabeab4e14b4c5af588d713f272cf1\nMerge: 5a6ca65 7ef88ff\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Mar 11 09:34:26 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 5a6ca65d00264c8a1dfbdf0535fa4da368476691\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:55:46 2015 +0100\n\n    no message\n\ncommit ea9511031fa9b58dadbec98735d663cd27e889ee\nMerge: 11651f1 5d513e6\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:55:33 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 11651f11999f0ec55ba0f890556eabe5a7b8b130\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:53:09 2015 +0100\n\n    no message\n\ncommit 1e03c9dc4bd48611ae69d9633263c0f0d6433eef\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:49:50 2015 +0100\n\n    Bertrand\n\ncommit 47cd8fb1860c97aa82649eb8b002b4aa000253f8\nMerge: 78b2bb4 ad56786\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:49:25 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 78b2bb489ec8c9943f988741084058d4ba246eed\nMerge: 0f5ab4b 48795ca\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:17:52 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\n    Conflicts:\n    \tspeakers/index.md\n\ncommit 0f5ab4bb3efc06833b343f94f7bb92c443d5c4e9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 15:16:39 2015 +0100\n\n    no message\n\ncommit 8f69cd73853ca04fcc13b2d5122ef8e11d8819c5\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 14:37:06 2015 +0100\n\n    Speaker\n\ncommit 71a48c96fdf047051b0c9be6f2a6847058c91812\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 14:07:16 2015 +0100\n\n    no message\n\ncommit eb855f86b4e30d23eb0210948ac791193c3993de\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 14:02:51 2015 +0100\n\n    Stein Inge\n\ncommit 88c7e17b4e3ac9763a70296588a083c8a255bb4a\nMerge: 7884dd3 b0b6563\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Mar 10 13:50:09 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 7884dd3da30b6005abc3b95254707fed59481125\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 17:06:50 2015 +0100\n\n    no message\n\ncommit c5d1b93c87e3f436c13d66d10b4136121d5b44e9\nMerge: 03813ff 38880e4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 17:04:09 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 03813ffa9a196e07e71e025bf2c9eea8f4d0ce97\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 16:58:17 2015 +0100\n\n    no message\n\ncommit c8b4495e4a6f2199dea9e5a8a1b2088e81512f95\nMerge: ee4205f 5fd7a7e\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 16:32:34 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit ee4205fe817802bd3356c72a39c68ada1f4518f9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 08:35:18 2015 +0100\n\n    no message\n\ncommit 6929613264ebbb42cf94c9c4cbd630f502f4ee08\nMerge: 16697e4 321e619\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Mar 6 08:33:07 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 16697e4487328a834312e324525844c4acd7f0f9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Mar 5 16:47:47 2015 +0100\n\n    Update\n\ncommit d73beba7b97c8bf89bc0072854637f2151ff17f5\nMerge: fe3f8ad bcdfafc\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Mar 5 10:55:40 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit fe3f8ad917a6fb0d7e6473a43cb3d1ea66522749\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Feb 11 13:09:26 2015 +0100\n\n    no message\n\ncommit 1d7e865a074a89c98cc207bcb112de546aa92e16\nMerge: 9d0964c c29b35e\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Feb 11 13:09:16 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 9d0964cd80bc332cde52794288bb9773190a9a66\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Feb 4 16:57:58 2015 +0100\n\n    no message\n\ncommit 684f42dc87b787c9948aab208f1b12ff9b5aad33\nMerge: bde6f54 e4d5c67\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Feb 4 16:57:47 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit bde6f54ef7062d1ef65ccfb3c96f3a6a9b156ac9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Feb 3 14:57:31 2015 +0100\n\n    Index\n\ncommit f2cf3979a6ddfe08660cd4e7ffd1c1e4d825a434\nMerge: bd6bce1 b7c71be\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Feb 3 14:56:31 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit bd6bce192bf64b0a113795e9c4586b6daf50c085\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Feb 2 14:57:13 2015 +0100\n\n    Front side bar registration\n\ncommit 9c8821b411b606c3718e79d4a6fa9b55ccd573ff\nMerge: 0dc9503 f8247be\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 30 10:14:58 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 0dc9503d7e242531a45ef336958de69b6079dc78\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 29 10:45:34 2015 +0100\n\n    Register Here\n\ncommit a94e3e4cb9203d3308fe1a347a776fe655d2aa9f\nMerge: 0faa64d 11014fa\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 29 10:39:34 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 0faa64d38c80a662f336e7b06bb4d35a52c3c663\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Jan 28 10:30:55 2015 +0100\n\n    Preregistration\n\ncommit 9571515e857f9fe9f7eaae49bd3f14dcc2d4a3a1\nMerge: d4074f9 f0391ec\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Wed Jan 28 09:35:52 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit d4074f904fb2b81338df37f39bebe554fa21fe57\nMerge: 544db19 1286d90\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 16:28:40 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 544db19970b0a53fbea5711fe1ba8fee15cb32fb\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 15:48:50 2015 +0100\n\n    Front sidebar\n\ncommit 05c96caa24698e951dd23ba3adfafca263e9b3d6\nMerge: 115636c 896b7bd\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 15:25:00 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 115636c619ec215d4b30cb9e607e73b49afd8721\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 14:57:51 2015 +0100\n\n    Frontpage\n\ncommit cb02023985cf5b6fabc4ac226f48a2de43be9397\nMerge: 8fa3534 cd1bc33\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 14:56:01 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 8fa35346ac41ec257ca1d73657512c91177d492b\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 08:34:24 2015 +0100\n\n    Front text\n\ncommit c9e80d9c00b15aeaf5adadf4a73e0b66c5b0c178\nMerge: ebfed88 2354a1a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 08:33:35 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit ebfed8803525c7c4b4d692a01cc4a1bd3c989cda\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 08:15:47 2015 +0100\n\n    Front text\n\ncommit d1f69632a298676dc10ba297757fc868fb2a818a\nMerge: 0f63c18 e4ae7b3\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 08:15:20 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 0f63c18a5763f72d3b341d6b4fb29182cc68f8e4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 07:55:35 2015 +0100\n\n    Hotel name update\n\ncommit 9c74727f4df758c63cc98c1acfdc4695d7d8138c\nMerge: 77f90ab 991afac\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Tue Jan 27 07:50:42 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 77f90abcee7a3abcf8a2df51ec969b4d19df6e2a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 22:23:10 2015 +0100\n\n    Registration\n\ncommit c6afcd70000756a366d9f0c76c8314c421cfc8b8\nMerge: 9e75d16 ec875f8\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 22:22:57 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 9e75d16e64c203ff06647727a727990f62401c38\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 21:45:40 2015 +0100\n\n    Index\n\ncommit 7fdb68a13ad5ee1dab0d6583ec7755d98909dd5f\nMerge: a5def1a 2c2f4cf\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 21:45:18 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit a5def1a23e165e1d59ef6065ce22505977ca07e4\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 17:07:46 2015 +0100\n\n    Speaker update\n\ncommit 4fd6f88e471b61f3797f7bac2b7b118fe31fcd59\nMerge: 52a9886 be90bf6\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 17:07:25 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 52a988640414237a36fe2547e7443685501ec2ed\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 17:05:41 2015 +0100\n\n    Program Update\n\ncommit 5f3d201096e438c059b27479c35e8b01a561373b\nMerge: 70a396e 9f17b25\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 26 14:45:16 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 70a396ec232c09ac79cf30a430d834ec398f651f\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 23 11:26:07 2015 +0100\n\n    Speakers\n\ncommit fdc424c6f45f49eb3032651dc7bb036296f86f74\nMerge: 41da69d a091b02\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 23 11:23:10 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 41da69d7106b1102dc299226ff82a2b46aef9d26\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 16:44:52 2015 +0100\n\n    Sponsors\n\ncommit 0039f2c8f209dc233a94238859d3225ec95f126d\nMerge: 840571e c5667a6\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 16:44:33 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 840571e23f593103412c66af7a0e16894be353ca\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:46:06 2015 +0100\n\n    Speakers\n\ncommit 91f106df22b3ed3f548a3316bf5e4e3c4bf6619b\nMerge: b368c2d 66997bf\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:45:52 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit b368c2d37b621d726ad8c67d292cca2cef769745\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:43:53 2015 +0100\n\n    Program\n\ncommit 410a987d7dd67b3629b07ef5be5e4c49d388e0fb\nMerge: 7b0edbd 6f9683e\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:43:18 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 7b0edbde5cb3d952b6c0ffa9831ef00ba0f8a796\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:39:56 2015 +0100\n\n    Program\n\ncommit a7a4cc3ca1a541c9e842c606fc74d5e41c40ff41\nMerge: a46e7d6 3847187\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:39:41 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit a46e7d68a55fc1766636d1f216740553e33c653c\nMerge: 3c99a41 242b1ba\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:35:11 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\n    Conflicts:\n    \tspeakers/index.md\n\ncommit 3c99a41da545e7f86d40a99073dbb8a6c154821a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:26:49 2015 +0100\n\n    Speakers\n\ncommit ee2e9cbb03d8ee9a951dd87da9ea95091a00b510\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 15:21:45 2015 +0100\n\n    Speakers\n\ncommit e3abafbcb69d775798265fd8de40a82f14404775\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 14:55:17 2015 +0100\n\n    Speakers\n\ncommit e1af65d5e928b258732f3e8a4824881fdeaf2d84\nMerge: c02b9ac e474cd1\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Thu Jan 22 14:47:47 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit c02b9ac13d668715d3091d30b1e5f0da0c24907c\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Mon Jan 19 15:23:40 2015 +0100\n\n    Misc\n\ncommit facc99777a936de550b9d7f5f882c66d782b7110\nMerge: 63472ba b660e24\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:51:28 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 63472bae0783277e0e674cc374de699e8cfc7786\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:33:01 2015 +0100\n\n    CFP\n\ncommit b991106178fcff9dcbb197043f07246574af911a\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:30:54 2015 +0100\n\n    Sponsorpackages\n\ncommit 19682c4d31671472510d45b4f435248e45f1555b\nMerge: 97f1433 c3c3846\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:29:28 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\n    Conflicts:\n    \tsponsors/packages.md\n\ncommit 97f1433848d8c6ed5b8640b7984e9d8343f2b4ca\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:18:04 2015 +0100\n\n    no message\n\ncommit 403ed8977c2f343516f60d41f0c4ecde62ace26d\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 16:14:50 2015 +0100\n\n    CFP\n\ncommit 7d3974b87203f4a21deef1fdb035ff3b01f41327\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 15:59:43 2015 +0100\n\n    Sponsorpackages\n\ncommit befed3d59828a0a85ec9a27a72ffba998d4740b2\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 15:57:31 2015 +0100\n\n    Sponsor packages\n\ncommit 8bf79bdc024ee40acc01ded1e0034f3732be549e\nMerge: 6403162 72f2d48\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 15:23:49 2015 +0100\n\n    Merge branch 'gh-pages' of github.com:CoDeConf/osl15 into ready/adam\n\ncommit 64031625bf40fb913486a63a3b49443c2be7d0b9\nAuthor: Adam Henriques <ah@praqma.net>\nDate:   Fri Jan 16 15:20:07 2015 +0100\n\n    no message","distinct":false,"url":"https://api.github.com/repos/CoDeConf/osl15/commits/d03b16aa7aa29aa267aa8bac522a1cfd8ae33d5b"},{"sha":"403e20194870568cc2dc5865f8b25e981f8d3714","author":{"email":"1d6d736997b89540a38c7c5c7df1e19d1de51b59@praqma.net","name":"Lars Kruse"},"message":"sponsors","distinct":false,"url":"https://api.github.com/repos/CoDeConf/osl15/commits/403e20194870568cc2dc5865f8b25e981f8d3714"},{"sha":"dd4cd4ea31cb7ed855e8dc5acb7ada059e1b54ca","author":{"email":"98b2e78111f5fb1e04bdf1ad40a8514a5123442b@praqma.com.com","name":"gijeli-slave"},"message":"Squashed commit of the following:\n\ncommit b59ec18de31b09b9f05c1f1c0aaf2b42cd5af3d6\nAuthor: Lars Kruse <lak@praqma.net>\nDate:   Tue Mar 24 10:33:31 2015 +0100\n\n    new front page","distinct":false,"url":"https://api.github.com/repos/CoDeConf/osl15/commits/dd4cd4ea31cb7ed855e8dc5acb7ada059e1b54ca"},{"sha":"e5284370aa0309f92631827552e7a59acadb799c","author":{"email":"fd0aa93434507bb33ff096a66a4891c2bc4fa12d@praqma.net","name":"Adam Henriques"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/CoDeConf/osl15/commits/e5284370aa0309f92631827552e7a59acadb799c"},{"sha":"d72157dee733c6615affa2493248f2a00763bba0","author":{"email":"fd0aa93434507bb33ff096a66a4891c2bc4fa12d@praqma.net","name":"Adam Henriques"},"message":"Merge branch 'ready/adam' of github.com:CoDeConf/osl15 into ready/adam\n\nConflicts:\n\tindex.md","distinct":true,"url":"https://api.github.com/repos/CoDeConf/osl15/commits/d72157dee733c6615affa2493248f2a00763bba0"}]}