first commit
fixed conflict
Merge pull request #2 from mephi42/master

look for gcc 4.6 in /usr/local/bin
Merge branch 'master' into better_branch
Merge https://github.com/mephi42/libcppa into singletons
Merge pull request #4 from mephi42/master

Autotools build changes
Merge branch 'master' of github.com:Neverlord/libcppa
documentation
Merge branch 'gh-pages' of github.com:Neverlord/libcppa
Merge pull request #12 from debio264/master

Added Includes - Compiles on ARM
Merge branch 'master' of github.com:Neverlord/libcppa
Merge branch 'master' of github.com:Neverlord/libcppa
Merge branch 'master' of github.com:Neverlord/libcppa
Merge pull request #15 from albertoma/master

Missing .hpp files in Makefile.am
Merge branch 'unstable' of github.com:Neverlord/libcppa into unstable
merged master into unstable
merge
merge
Merge branch 'unstable' of github.com:Neverlord/libcppa into unstable
Merge remote-tracking branch 'origin/unstable' into topic/libprocess

Conflicts:
	benchmarks/Makefile.am