Merge branch 'master' into upstream
authorEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Mon, 4 Nov 2013 19:26:01 +0000 (17:26 -0200)
committerEduardo Lima (Etrunko) <eduardo.lima@intel.com>
Mon, 4 Nov 2013 19:26:01 +0000 (17:26 -0200)
commited49769e5dbe18a6f151768bcd786f4b7e3ca8dc
treeac67027033ad3c5d29bb26053d372ef88579ba28
parenta50a703e0a4e21144573f99b08d86bc9964c8cd7
parent22aff324b5d1916c43ec4b0e952c7d32fa8d7bd1
Merge branch 'master' into upstream