3.2 butter, floyd
3.2 butter, dijkstra
3.2 butter, heap
Merge branch 'butter'

* butter:
  3.2 butter, heap
  3.2 butter, dijkstra
  3.2 butter, floyd