labofsahil/github-event-dataset-2012 huggingface dataset:
Styles, and import sass gem
named routes
partials
named routes instead of static links
use before instead of defining visit path
refactor tests
add users controller for signup
add links in templates
Added player info and friends to dashboard.
teste.merge
updated BlogJack.md will do more hours tmw since i was swamped with hmwk today
Added a check for undefined "result" or "obj" objects in setNested.
A recent change https://github.com/tgriesser/backbone/commit/71b6404d73f506627f0cc516177e39cc8c9947d7 in backbone allows undefined to get into this method.
TeamCity plugin - configurations update.
Major bug fix on  activity creation when allowAnonymous
Dont truncate the id string. Show a message for untranslated messages
fixed issues with empty fields causing widget to show error messages
Added differtiation for 32 and 64bit oracle prereqs
updated file mode
fixed comment
Missing rake from Gemfile
[maven-release-plugin] prepare release btrplace-solver-api-0.3
[maven-release-plugin] prepare for next development iteration
javadoc
- InstantiateVM -> ForgeVM
- upgrade to model-0.5
update repos access
update README, return JSON instead of plain text
double click, change locomotion field, change google speech field mode
AOSPxXx target
Add calculation for avg total energy cost
Bugfix: preferences' dialog not showing correctly because the referenced object doesn't existe on the ui file
Item11808: perltidy them all, so people are not accidentally impacted by the new enforced rule

git-svn-id: http://svn.foswiki.org/trunk/SetTopicValuesPlugin@14680 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
Added two new characters, Eiko and Vanessa. A couple of new moves have been added for Eiko.
add .gitignore
fix for Perl 5.17.1 (already deprecated with 5.14.2)

see http://www.cpantesters.org/cpan/report/df52358a-ced9-11e1-8755-e63c2a028b78
refactor with perlcritic
prepare version 0.42
Kategorien und Zuordnungen mit Berliner Kategorien hinzugefügt
Changed the name of the *couchdb* package to *apache-couchdb* to prevent
post-processing of the source distribution, added the zlib-1.2.7 package
and added md5 files for *apache-couchdb*, the *zlib* packages and the
*pcre* package plus added the .url file for the *apache-couchdb* source
distribution.
返金額をデータベースに保存する仕様に変更 #105
返金要求メッセ—ジを作成完了 #105
返金キュー、返金先情報の入力フォームまで完成 #105
リストテーブル完成 #105
use $clientIp instead of $address

this, to be consistent with the rest of the file.
the value is already a Net::IP object
test a bad trusted hostname and a bad IP addr
new post about static vagrantbox.es site
Catch up README with changes
add dice push certificate
Merge remote-tracking branch 'origin/master'
rename files
Merge remote-tracking branch 'origin/master'
index IE image fix
Added kn#049
eval-in-project test
Add an alias to new_preauthorization_url.

To fix an inconsistency between the docs and the Python client library,
this commit adds an alias method called new_pre_authorization_url.
Refactor as per suggestions
Merge pull request #9 from gocardless/preauth-alias

Add an alias to new_preauthorization_url.
Better listeners, they now fire when there is a change. Started Listener
TestSuite.
Publisihing v1.10 of com.gu.pa-clieant
Site updated at 2012-11-17 13:48:27 UTC
Rename Widget directory
Rename Module directory
Update path changes
Remove PHP code
Rename default template to Amy
Delete redundant files
CheckBox clientes consultando en bd, agregado metodo para eliminar productos de la factura
Added color to message sent to standard error
fixed title in Cognition submission
Sync jenkins-Heat-142 build logs
Sync jenkins-Heat-9 build logs
more rough drafting
section Approach
minor corrections
Readme: First thoughts (still unfinished, Markdown test)
toma grecio
move Bundler topic before `vendor/bundle` warning
[Resources] [crud] display Request namespace for new, edit and delete actions.
Install gcc-c++ for pcre
nginx depends on pcre
Update README.md

Clarified that messages with void return types are sent to all target delegates that *respond to the selector*.
support rc versions in prepare release script
bump version to 1.0.2, update release notes
fix minor style issues in README
Merge branch 'v1.0.x' into develop

Conflicts:
	easybuild/tools/version.py
many new pages
Updates to the snippets files along with some conversions to pdf
Site updated at 2012-12-07 04:01:17 UTC
Site updated at 2012-12-19 13:01:22 UTC
Site updated at 2012-12-02 03:01:20 UTC
Site updated at 2012-12-11 19:01:18 UTC
Site updated at 2012-12-16 06:01:18 UTC
Site updated at 2012-11-21 23:01:18 UTC
Performance bug fix, remove case insensitive support.
Add spents list
first commit from ubuntu 12.04 with a new post
Makefile für automatisches Hochladen.
Fixed compilation error (in case without networking)
Fixed clock warning messages
Added ipt4_defconfig for iPodTouch4G
Supported interrupt for s5l8930 uart.
Shell through ttySAC0 works, with some issues
irq-uart.c: Added rx timeout logic
Implemented arch_reset
Merge https://github.com/YustasSwamp/iDroid-kernel into idroid-3.0.0
Post: add post about google bot and delayed JS
Post: Google bot - fix typos, add a link
Post: Google bot -- Minor changes

* Implemented grammar suggestions from @sterlinghirsh.
* Added a few headers.
* Reworded a sentence or two for clarity.
Merge post-google-bot-delayed-js (#10) into gh-pages

Post: add post about google bot and delayed execution of JS
Make user and player profiles visible to anyone
Define user show action
Create user profile page
Improved the way attachments are resolved
v.4.2.2 register
Added functionality to the biotac_pub to publish null data if the param _null_msg:=True
Fix changes in the buffer view did not result in a refresh of the view
Prevent breaking the script when the stacktrace exception is thrown

This is when the user have set the setting "Break when an exception is
thrown".
"Prevent" is more like auto continue.
adding initial job implementations
Adicionado suporte a Windows.
Added temporary gemfile
add multiple versions of same package capability and fix version param

namevar is required to be unique across package resources.  puppet does
not provide an alias for the package name and therefore uses namevar.
if you wish to install multiple versions of the same package, simply
set the namevar to pkgname<space>version and the version will be
ignored except from a namespace perspective.   Assigning the version
to the ensure => will be the actual version passed to chocolatey.
This also now functional so that it appends -version switch
if ensure is a defined string.
Merge pull request #2 from iseoptions/fix_explicit_vers

add multiple versions of same package capability and fix version param
Arreglos en las pruebas unitarias!
more raiting system work
Saved space and separated the plugins.
Add transaction errors to base instead of raising
prettier auto index
add add_onsets function
Merge branch 'master' of github.com:jansoe/NeuralImageProcessing
created my first scala object
childErrorList doesn't *need* a ref
Merge pull request #130 from jay-hodgson/develop

SWC-322: rework locationabletitlebar to support long entity names
SWC-115: make cookie expire after 24 hours
Merge branch 'develop' of https://github.com/Sage-Bionetworks/SynapseWebClient into develop
achievement screen in storyboard
Added PassFields resource.
got a working method now, finally
updated scrollbar a bit
Deal with nulls coming back from RDotNet
Support converters for interfaces.  Support any type of sequence for inputs.
Better algorithm to find converters.  Support list outputs.
Expand tests
Refactor tests and cover more datatypes
Updated to latest build of FSCheck.XUnit
Fix null reference
Support pairs for varargs so they can be passed named
Add Wrapper Generator to generator wrapper classes usable from C#
merged stuff from BlueMountain;
Replaced mongoskin by mongoose, cloudfoundry by Heroku. Added cookie storage session support.
Carmen-Gallery V2
CSS changes
add fcm paper
Update normalize.css to version 2.0.1
add dataware.slibs hello in
ready to request registration in resource
created a test against install_version_storage
Fix install_version_storage to pass test
Merge pull request #9 from bentglasstube/master

Incorrect behavior in install_version_storage
bullet animations
Animation fixes
release 0.0.2 of test-utils
Add setExpirationDate function in user enrolments.
Added code to execute updates in Lexicon.py
Merge pull request #5 from sjacks11/patch-5

Added code to execute updates in Lexicon.py
Redo defintiions to add forwarder and to add ability to specify log file name
Remove most of base config since not doing system logging
Fix syntax in definition. Allow specifying protocol for forwarder
Recipe for using syslog-ng for system logging
GLobal recipe should include default recipe
Forwarder does not need paths
Explain new definition in README
Rename syslog_ng_app to syslog_ng_file
Fix name in forwarder definition
Add logfile compression
Bump version
Syntax fixes
Template erb fixes
Break source out into own definition
Allow configuring filters
Merge pull request #1 from sciurus/master

Allow forwarding configuration
[project file]
Pre cleanup for submission
update cv with new pub
[MOD-802] Added docs for ti.cloud friends, message, events, and files.
timob-9589: saved work #1
Expose scrollsToTop on iOS.

https://jira.appcelerator.org/browse/TC-882
added getPhysicalSizeCategory() Ti.Platform.displayCaps for Android
timob-9589: added save method.
timob-9589: comments + code clean up
TC-1078 set charset variable when charset is not utf-8
fixed removal of views with border from a scrollview
[TIMOB-10010] Initial stages of switchover to block-based animation system.
timob-9589: documentation added
[TIMOB-10010][TIMOB-10047] Stage autoreverse animations into two phases to avoid bad behavior.
Also, autoreverse now reverses ALL changes made by an animation.
[TIMOB-10010][TIMOB-10047] Cleanup of old autoreverse method, better property reversion support.
[TIMOB-10010] 'complete' evenitng fixes for autoreversed animations
timob-9807: create common namespace for autolink
timob-9807: update docs
[TIMOB-10010] Fix completion eventing and math error for undefined repeat count.
[TIMOB-10010] Fix spelling
timob-8472: fix edge case fastdev loop.
Merge branch 'master' of git://github.com/appcelerator/titanium_mobile into timob-9807
timob-9807: addressed comments, also fix a small formatting issue in Label.yml
Fire back event onto the correct window.
Update latex2html.l
Adding demos for spinner, menu and tooltip
Site updated at 2012-12-23 17:43:56 UTC
Change name to request-extend
use bind-mount instead of relaunching Boxee
Add doc string about heroku database url format.
adding chef cookbooks to get a basic server going.
Added business logic build to -pre-build custom android ant target so it builds with as a precondition of the main android build
Add receipt of payment mailer
Add status stuff to customer index view
Android

'getCurrentPosition' may have issues on my Android 2.2 device. Trying
'watchPosition'.
""7661443 updated
""
coffeescript version README, and removed old style.css
last edit, hopefully!
new design... again
replaced reset-top.css with reset-bottom.css
Merge remote-tracking branch 'remotes/mathiasverraes-github/patch-1'
Added additional fields to book
refix Gemfile
reroute root to 11/20/2012
added songkick migrations, rake task, and fixed time bug in view
added task rake data:songkicksea
fixed date formatting to PST
added paginate gem and additional views for new columns in model
hardcoded date until new youtube sourceids added
fix postgresql error type migration
fixed no exception being raised on failed event save
commented out events index pagination
reset to live data, paginate events
Merge pull request #11 from andr3w321/master

Refixed Gemfile
delete unseless gems
add .rbenv-version
Add Item class (NOT WORK)
Implement ItemTemplate
Currently not work.
Need more modifications.
Major update for item system
A lot of work, client-side and server-side
I've never thought that this will take more time than I expected (It's a (very :P) bit more complicated that I've thought)
A lot of work for items and bags (server-side)
Add class Item (better)
And some major adds
[asio] New objectives for this branch
Fix several leaks. Soon gonna fix major one
Get rid of some leaks. NOT TESTED
[asio] WorldSession fixes
[asio] TODO
[asio] Use raw ptrs for WorldObject. TODO: LEAKS!
[asio] Less mem leaking. TODO: needs valgrind
Update test_db_full.sql for item system
Need a little more work on row...
[asio] Valgrind is a gift from god
Item system should work soon.
Some fixes and adds.
items and character_bags tables
Now, bags are loaded in Player::LoadFromDB
Merge branch 'master' of github.com:krofna/Warrior-of-Dreamworld into item_work
Fix conflicts
Conflicts:
	client/World.cpp
Fix compilation for Client
Add ObjectMgr client-side
Items DB client-side
[asio] TODO
Update sql/test_db_full.sql
Update server/CommandHandler.cpp
Update README
[scripts] Resolve conflict
Nicer console on server side :)
Fix server crash. This closes #6
Merge remote-tracking branch 'origin/master'
Cosmetic fix
Update /doc/
Reverse IP Scanner
Merge pull request #7 from kumarshantanu/master

Fix documentation typo
Add a contributors section.
Use clojurescript 0.0.3-f2d58284a8, notch version.
Add a detailed sample.project.clj file.

Closes #6.
Add a note about example.project.js.
s/example/sample.
Use the lein-cljsbuild group-id to indicate canon.
Use the latest fs, clojurescript, and clj-stacktrace.
Notch the version number.
Catch *all* errors during compilation.

Fixes #13.
Reorganize the :uses and :requires.
Pull crossovers out of the classpath.

This allows more flexibility in the sources of crossover files.
Closes #9.
Add a "cljsbuild clean" task, and hook into "clean".

Closes #12.
Don't copy macro files into the cljs directory.

Closes #15.
Document the use of CLASSPATH for crossovers.

Closes #16.
Add a decent docstring for cljsbuild.

Closes #14.
Added support for multiple cljsbuild builds in the same project.clj

This is extremely convenient for doing library development in
ClojureScript. This allows cljsbuild to compile in all 4 optimization
levels at once, for easier testing, or to compile a test suite
alongside the library code.

Each build runs in parallel, with appropriate locking to ensure output
isn't garbled. It seems to work well in both 'once' and 'auto' modes.
Use the official ClojureScript package.

Closes #19.
Update the example to show multiple cljsbuilds.
Document the new parallel build feature.
adklfjsdalkfj
Added direction settings on GPIO
Pang added
Merge pull request #2 from alejandrovallejo/patch-1

Pang added
Link to Mozilla docs.
Las respuestas a las preguntas tambien se envian de forma asincronica.
Adding forked version of the websocket library as a submodule. Created it as a subdirectory of new top level directory submodules because there is a bug in git to do with adding a new submodule in the same location as a submodule previously existed (see http://jondavidjohn.com/blog/2012/10/replacing-a-submodule)
classe Analise renomeada para Analisador
Merge branch 'master' of github.com:leonardofl/radar_parlamentar
CheckEmailExists update
Merge branch 'master' of https://github.com/leovanhaaren/Themaopdracht-3
Update
Merge pull request #23 from jvrhenen/master

Email check update
Add rate control docs.
getUserByActivationKey test working

Still in trouble to execute registerUser + getUserByActivationKey tests
at the same time (issue appear after multiple calls)
Site updated at 2012-04-26 15:11:14 UTC
add donors
set width to 900
Site updated at 2012-07-25 07:43:36 UTC
Added modal popup to say the site is loading (which is long in IE).
Accessibility, not accesibility
Devise support added
Luke: added field for elasticsearch under system
Fixed permissions
Updated dependancy
added new airbrake key
update for harryh
Add git method to Dist::Zilla::Role::Git::Repo

  Allows simpler code in plugins:  $self->git replaces
  Git::Wrapper->new( $self->repo_root )
Remove File::Copy::Recursive from tests

  It wasn't actually being used, just loaded
Add version_by_branch to Git::NextVersion (rt#76703)

  Add version-extraction.t
Ensure Git::NextVersion works on empty repo

  It shouldn't crash if there are no commits yet.
Use rev-list instead of log

  Fail softly if git < 1.6.1 or nothing checked in yet
Add version-by-branch.t
Add .gitnxtver_cache for Git::NextVersion

  This way, we only have to scan the history once per revision.
  Repeated builds can use the cached results.
Add tests to check .gitnxtver_cache
Check Git version before initializing repo
Add include_untracked option to Git::GatherDir
Test the include_untracked option of Git::GatherDir
Add untracked_files option to Git::Check
Test untracked_files option of Git::Check

  Ensure log messages are as expected
Add before_release check to Git::NextVersion

  Prevent duplicate versions

Remove version cache file AfterRelease (just in case)
Split _max_version_from_tags into _max_version & _versions_from_tags
Remove MooseX::AttributeShortcuts (wasn't actually used)
Test Git::NextVersion's duplicate version check
Document Git::NextVersion's before-release check
v1.122770

 - fix rt#76703 - add version_by_branch option to Git::NextVersion
   (christopher madsen)
 - Git::NextVersion now aborts release if version is duplicated
   (christopher madsen)
 - add include_untracked option to Git::GatherDir (christopher madsen)
 - add untracked_files option to Git::Check (christopher madsen)
 - Dist::Zilla::Role::Git::Repo now provides the git method (christopher madsen)
NetBeans 7.1.2 - github project integration
NetBeans 7.1.2 - github project integration
Merge branch 'master' of https://github.com/mansoor-s/Galactic-Supremacy
Refactored Stage.Galaxy. Refactored Utills to be properly namespaced and not be globals. Added shader extras to index.html
moved ShaderExtras.js to postprocessing dir
fix archive for years which have adjacent posts from the same month
Bug fixing get_field_names and wrap

get_field_names was failling in one of the basic recursive cases. Tests
have been added and the method has been polished.

wrap was failing when wrapping a basic string field name.

This should fix issues with filter_by_widget reported in #GH-85
Update jq-Wysihat from https://github.com/nhowell/jq-wysihat
last modif beamer
retire neoitems links, replace with jn items links
string conexion
...
Merge branch 'master' of https://github.com/maumchaves/ProyectoFinal-SIA

Conflicts:
	ProyectoFinalSIA/ProyectoFinalSIA/Web.config
added google analytics
added a new post on compatibility.
added pyramid post
domainok
pulled sentence from field mapping
added md5 to the install text
Addressed a likely question.
Remove fedora interaction for now.
made the disjoint-sets data structure a little faster by using BitSets
bringing in bootstrap and cljs
Exception java doc model
Louisa 26.06.2012 (23:35 Uhr)

*Detail Views geändert, so dass sie in allen Browsern hübsch sind (hoffentlich)
viola-jones et visual studio

ça roule ma poule

prochaine étape : appliquer lbp sur une image, parce que c'est tellement
lent qu'on peut même plus appeler ça du temps réel
Move digipres formulae to homebrew-digipres

The new home for my digital preservation tool formulae is at:
http://github.com/mistydemeo/homebrew-digipres
Excerpts ftw
Adding support for alternate home directory

so that I can easily keep the repositories on a network
file share.
epic commit vol3
Move license and untabify it.
dashboard

lol
Vandana, Sharvani, |#00| Modifying location performance test.
Bump required version of pyramid_whoauth.
catch any protobuf serialization error
Added precision mode, joystick tolerance.

Also, lines to actually drive the robot are now uncommented.
Starting to look so nice :)
update
add roman numerals to the enum list
Add email information
Use relative codes route on search
Use /icd9/codes route on search
Mobile wrappers code
Add compilation shell script
Adding CI license information
Make the code much simpler

Much of the code can be removed and still function the same. The main
thrust of this change is that there doesn't need to be an "each()" loop
for iterating over the jQuery collection, because setting all their text
with one call to "text()" works just the same. This removed the
necessity of having specific "linked" and "text" vars, since we can just
call this.val() directly.
Simply use JavaScript for the primary plugin language

As beautiful and as fun as CoffeeScript is, this plugin is so simple
that using CoffeeScript is a bit overkill. I would recommend using
CoffeeScript only when you need to write *more* than 8 or so lines,
unlike here.
z
Merge branch 'master' of https://github.com/myong0418/TenVersion_Project.git
First working version of project manager jsp. Add 5 controllers(not
working)

Signed-off-by: Anton Aharkau <Zer0orama@gmail.com>
fix AlBlock manager transaction management
Site updated at 2012-12-10 13:35:17 UTC
Support ARC.
Readme
Code clean.
hand directive is now working
semicolons
refactoring into one controller
finished refactoring into one controller, created basic card action methods, removed needless directives
added playCard method to play card on riders
a lot of styles and sorting and funneling almost works
Merge branch 'master' of github.com:noahsark769/asuc-funding-app
Debug printf's in syscall code
Add the invoice paid on April 10th, 2012
Changed AdvanceSettingsGUI
working on adding highlights
mergin conflict, adding full-size image
Metrics updates (lib/nolib)
Less crappy favicon
Added min-width to #header
Updated WebMedia
[openvix] reverse to depends.
added slides for getting started with clojure
next try to add LinkedList
Cálculo de Valores
Fix to use env vars to build path to git dir.
Primer commit proyecto inicial - veci
Добавлены дополнительные тесты на contains.
Fixing invalid reference to "raptor/path" which should have been just
"path"
Merge pull request #2 from philidem/master

Fixing bad reference to "raptor/path"
Use data providers in order to make repetitive tests DRYer
bz19452: Fill all space in the tableview.

Don't leave any space to the right, or it will show a white vertical
strip.
Use the nginx module to create the reverse proxy.
That gave a syntax error in concat, lets try a hardcoded port.
This should work a little better
Lets try hard coded strings
Variable timeout renamed to keepalive
Revert "Lets try hard coded strings"

This reverts commit f6675575e1fa6dfb25fd49080c4a8b1295565d2c.

Conflicts:

	manifests/proxy.pp
Convert to singleton_resources
Tidying up demo section a bit
Litt oppdateringer her og der
Merge branch 'master' of https://github.com/perandre/perandre.github.com
Failing test for IE bug
patch for IE
creating a json format view using rabl builder
removing jitsu spike
Sync with the original FreeBSD ports tree
First phase for gdb 7.5

* Adapting Makefile and distinfo
* Removing integrated patches
show on rule page if the rule is not assigned anywhere
include resources via viewlet
update, not updates
ArcusFactorial_FullRangeTest crash fixed, gitignore updates
MasterWorkerProxt to WorkerProxy
Stop patching Paperclip.logger

https://github.com/mshibuya/mongoid-paperclip/commit/06f39b23fe1acb874fc
9f48f5cb68dc3284b253e
attempting to use rails logger
version bump
Merge branch 'develop'
Update output/win32/readme.md
Envoi de mail aux étudiants
Merge branch 'develop' of github.com:projetpeip-montp2/badger-www into develop
Frontend: Editions
Added gitignore file
Removed .egg-info dir from repository
Moved media-dir to static-dir to work with Django 1.3 staticfiles
Added temp files (*~) and .egg-info to .gitignore
Cleaned up get_ordered_path_list and changed path order.

LOCALE_PATHS from Django settins are now placed in the beginning of
the locale path list, so app-specific paths do not get precedence. This
seems to be the same order Django reads these dirs (at least with version 1.3)
Modified the README file

Some information abount project's history and current developement efforts
Fixed tag names and removed custom tags

inline_trans tag should not be registered as trans-tag, but
as itrans.

Inline_trans cannot be used inside JavaScript code, so the tags
have been changed to regular trans-tags. Also, it is not practical
to use inline_trans in the toolbar.
changed setting of the jsdoc reports

Jira issue: WP-101
Site updated at 2012-08-15 01:08:40 UTC
fixed the database! It should be error free at this point.
we are generating the upgrade answers now, forgot in haste and lack of sleep
Merge pull request #186 from justinstoller/maint/master/generated_upgrade_a

(maint) we are generating the upgrade answers now
(maint) Fix spec failures resulting from Facter API changes

Without this patch stdlib tests fail against Facter 2.x and master but
not 1.6.x.

This patch fixes the problem by initializing the example group
differently depending on the version of Facter integrating into the
system.  The adjusted methods are:

 1.x - Facter.collection.loader.load
 2.x - Facter.collection.load

The collection actually implements the load method in both version, it's
simply marked as private in 1.x.
Merge branch 'fix/2.5.x/facter_loader' into 2.5.x

* fix/2.5.x/facter_loader:
  (maint) Fix spec failures resulting from Facter API changes
Merge branch '2.5.x' into 2.x

* 2.5.x:
  (maint) Fix spec failures resulting from Facter API changes
Revert "Merge branch '2.5.x' into 3.0.x"

This reverts commit c8c7afc7a00aaeeddea6514d9fe9508513e53a73, reversing
changes made to 03ec16e291a70ac5ac412be36ae3b86a771b98af.

This was a mistake on my part.  2.5 is a minor release and minor
releases should never be merged into patch level branches.  2.5.x should
have been merged into 3.1.x instead.
Merge branch '3.0.x' into 3.1.x

* 3.0.x:
  Revert "Merge branch '2.5.x' into 3.0.x"
Revert "Revert "Merge branch '2.5.x' into 3.0.x""

This reverts commit 9e8c60a8b73fd96393b08d690c7197e62aae623e.

This was an error on my part.  3.1.x descends from 3.0.x _and_ 2.5.x, but 3.0.x does
not descend from 2.5.x.  I should not have merged 2.5.x into 3.0.x,
instead I should have merged 2.5.x into 3.1.x skipping over the 3.0.x
merge up.

I'm slowly starting to understand the implications of semver on our
branching strategy...  =)
Merge branch '2.5.x' into 3.1.x

* 2.5.x:
  (maint) Fix spec failures resulting from Facter API changes
Merge branch '3.1.x' into 3.x

* 3.1.x:
  Revert "Revert "Merge branch '2.5.x' into 3.0.x""
  Revert "Merge branch '2.5.x' into 3.0.x"
  (maint) Fix spec failures resulting from Facter API changes
Update Modulefile, CHANGELOG for 2.5.1
Merge branch '2.5.x' into 2.x

* 2.5.x:
  Update Modulefile, CHANGELOG for 2.5.1
Merge branch '2.x' into 3.x

* 2.x:
  Update Modulefile, CHANGELOG for 2.5.1

Conflicts:
	CHANGELOG
	Modulefile
changed title level inconsistency - please check
Fixed global upload target, got removed during refactoring
use connection closing timeouts whenever possible
2's Complement Solved.
Add carstore example with DeftJS
Update .gitignore

Added bin to .gitignore
Initial commit
Jirasoap class added
another divide by zero
Fixed fallback-to-local jquery links.
Tooltip looks better on the right.
Clarified definition of "Legal Notices" (includes license texts).
[maven-release-plugin] prepare release maven-nar-plugin-2.2.0
Update example/web_deploy/README.md

fix links
trying more project files
list item chinese encoding
Created private methods that determine whether a string is an operation and what type of operation it is. There will be used when implementing tickets #12, #13 and #14. Also reorganized the code into sections for easier readability.
Move images into image folder. Update hello world script to begin using BitBuilder.
Revert "Trimmed the branch to only the test_nodelet sub directory"

This reverts commit b1b84e4fbc0df2b3b103cd149b54e513e2bf8d74.
Rebase from 'upstream' @ version '1.7.12'
Trimmed the branch to only the test_nodelet sub directory
Se termina la app demo
Add library settings editor from Sally/ESI. Thanks Sally and ESI!
Updated _posts/articles/2012-07-28-lorem-ipsum.md
Update dummy payment
Fixed EventModel.cs to reflect latest database schema
Merge branch 'newdatabase' of github.com:sagittaros/EventManagerModel into newdatabase

Conflicts:
	Event/DomainModels/EventModel.cs
Site updated at 2012-05-02 02:03:48 UTC
Changing verbage
更新 css.md
Check schedule when RFID card is scanned
trying to fix failure- add18
adding the aws post3
adding the initial project from my personal svn
Blog i dodawanie newsow
link subdomain
Site updated at 2012-10-08 20:47:42 UTC
i add property to UICreateTabBar
href value to navigate between view's with tab bar.

and i add tabbar>uibutton to UINavigationList

this work on my computer
Add wiki pages as documentation.
Bumped spree core dependency to 1.1.0
Fast RSA
Modified railes
updates of manufacturing and new katadc
für björn
Fuid pages
Fix install of license path and let it be verbose
Site updated at 2012-10-11 13:33:31 UTC
attempt 2 - pagination didn't work on last commit (so figured had forgotten to regenerate site with jekyll before committing produced html)
Created Google+ connector.
Merge branch 'EdgarSocialConnectorGooglePLus' into development
Fix Redmine #1473: getCssRecord invocation
Merge branch 'AndroidUIDev' of https://github.com/societies/SOCIETIES-Platform into AndroidUIDev
Add PrivacyDataManager Light Version to Android build
Context GUI type updated
Sxolio gia debugging
add profile approach that lives with Maven 2 and Maven 3 at same time
ignore atlassian-ide-plugin.xml from IDEA
Bumped SISU Velocity to released one.
Increased version number
Fixing a few NPEs
TableGen can save to SQLite DB as well
Removed pom.xml
Updated README file.
Removed wiki submodule
Android Lint-suggested changes.
Merge branch 'develop'

Conflicts:
	pom.xml
html tags stripped from chat in the log
saving local copy
Merge branch 'master' of github.com:squdgy/dailyfantasystatstool
removing minified version of bootstrap css
picture and share text
tests | removed some tests because of db permission problems.
updated score-keeping

Applying baseball-ish statistics to programming commitment... I hope
this isn't evil.
fix hard colop5
adding error notification
-- login ekranı için session prototipi yapıldı.

-- hata mesajları için bir div oluşturuldu ve content pageler eklendi. master page'e de ekleyebiliriz aslında bunu.
resimler çıkarıldı.
FilePage: added getFileName(); SubmittedFilePage: added addToWatchList(); TestSubmittedFilePage: added clickWatchListsTab(), isFilePresent(), & Test_Add_To_Watch_List()
clean up line endings: all now use unix endings
fix compil: late nate fail
fix cpufreq missing header
Removed references to Utilization.
Removed daily utilization and added columns for assets.
Got rid of RVM, not necessary for single purpose server installation.
Added daemons
Added collector_control
Added collector upstart config
Fixed edit and index. Checks for logos correctly.
Added dynamic generation of asset docs.
Changed the text tab image to make it stand out more.
Add context filter to "node_run" key binding to avoid conflict with regexp toggle in search pane.
Merge pull request #22 from ptrm/master

node_run Win & Linux shortcuts conflicted with search pane regexp switch binding.
Fixed logistic regression
Merge branch 'master' of https://github.com/tazdar/breakfast-club-python
See http://tduchateau.github.com/DataTables-taglib/changelog.html
Start working on layout feature

--HG--
rename : webapp/src/main/webapp/assets/images/magnifier.png => oldapp/src/main/webapp/images/magnifier.png
extra : rebase_source : 768e6438d4b1146618da079608e05af74398e42c
Reminder to ensure proper logging when an exception occurs

--HG--
extra : rebase_source : 4bd4fe2e869878a77a623f260ef72c83ee4957f0
layout feature done

--HG--
extra : rebase_source : b34cd4342c9744251a542a765bab8e74f27c4cf3
fix style of flash message
move to the center because it looks bad on the real site
bump version to 0.3.0
update CHANGELOG
Some testing updates.
Some more testing updates.
More tests
Made it through test updates.
Added mean tests.
Fixed TTD example
Attempting images in markdown.
Trying to get image right.
Updated testing.
Typo fixes for testing
Updated docs
Updated doc section.
Added more doc info
more docs.
Updated doc site.
Added Sphinx exercise.
Merge branch 'master' into scopz
Remmove dead code

Code involving manual marking and watershed removed.
Automatically filter point cloud

Use the filled contours produced by object detector to automatically
filter the pointcloud to display only the main objects in the scene.
Change starting tilt from 0 to 10
Experimenting with cached depth

Cache last ten depth frames. Add button to dump to stdout.
Initial commit
initial commit with wordpress install
Merge branch 'master' of github.com:brstorrie/theme-yeti-core
fixed readme
Adding support for badges in favicon
Alteração nos formularios
Site updated at 2012-08-01 01:39:32 UTC
Site updated at 2012-08-01 00:59:50 UTC
Site updated at 2012-07-05 01:49:09 UTC
unix line endings, please!
若干插件增加和配置修改

增加tagbar
取消trinity.vim，直接使用srcexpl.vim
用delimitMate替换autoclose
增加matchit.vim
移除autoclose,trinity,gundo
Adding SQL file for setup and refining the model a bit
added CPU OC/UV and vdd level
Allow for switching between git and svn

Depending on the kind of checkout, msfupdate should be smart about this.
This was first proposed by @corelanc0d3r I believe, but rejected because
it didn't seem to solve any immediate problem. Now, it does, as we are
ditching SVN Real Soon Now for performance reasons.

This change is minimal functionality and doesn't handle switching over
from one to the other.
Oops on is_svn
Make msfbase_dir an instance variable
Allow for naming a git remote/branch
Add new uuid
changed extension on README
potentially fixed a bug in published page tracker retry algorithm.
Added a demo Close button
Merge pull request #300 from toutpt/master

add repo:collective.localrolesdatatables
merge and clode #302, sort all again *sigh*
manual do changes from and close #301
manual do changes from and close #299
Update master
Merge pull request #303 from malthe/patch-7

Update master
sort
closes #294
README
typo
add footer message to make people aware of possible merge conflicts
remove sort-generated trailing slash
close #304
add ckeditor repo
workouts are now fetched from mongo and displayed on the calendar
Ignore trash files.
status: added meminfo and test
Calculate actual size of encrypted field to ensure it will really fit in DB. Validate based on size user provided.
Update index.html

Removed maps.
Commit de teste automático de build do jenkins
updating documentation with v2.0 class signature
added normalize, and other pages
Sessions: Sven auch noch rein
fix pyramid compat issue fixes #19
Bootstrap pages
created gooter.html, removed footer from index
Commit Inicial
Signed-off-by: Victor <victorhugo.chalian@gmail.com>
Sets up more semantic markup for index and report page, should fix #17
Shares header elements between pages. Adds google analytics.
Removes unused local variable and makes the feature detection variable names make a bit more sense.
adding a index.html file on my new feature branch
Merge branch 'refs/heads/matts_feature' into development
workaround Checkbox issue in ExtJS when clicking the field label it's value didn't change
support any styles in html styles, backport
Flash_Upload: add componentToString method
user added -> tobias
swfupload: send boolean values as 1/0 as else 'false' as string would be sent
Styling for prettier pageloading
Admin::componentToString for Chained Default Implementation
add support for Trl in Flash component
LinkTag_Mail: mask 'and' correctly

if not masked html is not valid and xmlparser when sending mail stops
improves last fix
changed the user-service settings for the new server
changed the user-service settings for the new server
changed the user-service settings for the new server
Merge branch '1.8' into 1.9
Merge branch '1.9' into 1.11
Merge branch '1.11' into 2.0

Conflicts:
	config.ini
Merge branch '2.0' into 2.1

Conflicts:
	config.ini
don't use kwf in vps
added function getDomainComponent, it returns a Vpc_Root_DomainRoot_Domain_Component from a Vps_Component_Data
Filter ComboBox: add config for listWidth setting
adding korea info
Update 7_3/README.txt
add osm map images
marginesy na 0,5
* Reformatting scss files, nothing was changed
ddd
asdfasdf
UX improvement
Convert routines over to new database methods
Port the transition function to new style (except delete).
Update json file for switch_config role
Merge pull request #48 from galthaus/pull-req-release-rails3anddb-master-bdffe83d65

Switch over to new objects compute nodes almost work rename needs some help [25/29]
Start of network API work:

* Updated crowbar CLI to include network CRUD operations
* Updated routes in include network CRUD operations using new API standard
* Added stubs to network controller for validating CLI & browser execution of the CRUD operations
* Added a minimal, hacky implementation of network create.  More work coming on this.
Merge pull request #50 from cdearborn/pull-req-release-rails3anddb-master-0699959d82

Front end for network API [2/6]
connman-qt: remove 0001-don-t-throw-exceptions.patch

* not used after d3afe972cd7f7a65eb4ff8bd5858423b35332657

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
xmlbeans in vendore
getDegree 수정
rewrite serial com state machine and protocol
add message type to request aux switch names
simplify AUX switch names to preserve memory
rewrite serial com state machine and protocol

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWii_shared@860 02679b44-d973-9852-f2fa-63770883b36c
add message type to request aux switch names

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWii_shared@861 02679b44-d973-9852-f2fa-63770883b36c
simplify AUX switch names to preserve memory

git-svn-id: http://multiwii.googlecode.com/svn/trunk/MultiWii_shared@862 02679b44-d973-9852-f2fa-63770883b36c
Merge branch 'upstream_shared'
added a SimpleProcessor to be used in a management command to process 50 emails at once
Fixed a error caused by the getBoundingBox() name change.
Should be Chapter 13 Ex4
add Chapter 10 Ex11
From Office-PC
更改了域名为xugaofan.github.com
Re-disraction update to work with manifest version 2
Automated commit on Wed May 30 21:17:28     2012
FIXED ALL THE SHIT
fixed callback mouseleave bug
Site updated at 2012-12-21 05:51:11 UTC
Site updated at 2012-04-14 16:13:58 UTC
Highlighting tweak; patch indentation for "description".
Rename tads3-mode.el -> tads3.el
point to the sorce
Update notes for submitted changes

* ROMControl: Navbar height more dimensions
Statusbar: add back brightness toggle (slider)

Change-Id: I9b71b432982f8f4703a1b6c1d74510f40371d14d
Signed-off-by: sethyx <sethyx@gmail.com>
Update notes for submitted changes

* Fix up fast charge code in BootService.java
Clock: adds Options for custom date and clock apps

Change-Id: I22c50b4d0508f4fcb1884d3a8956db479a3ea97f
Merge "Clock: adds Options for custom date and clock apps" into jb
add "mongodb" provider
Renamed window title to match the rest
Updated the readme to reflect recent additions to supported podcasts
Added support for Solarstone - Solaris International

See http://www.solarstone.co.uk/radio for track listing
Filter out "original mix" when parsing remixes

original mixes are not remixes by definition
Hopefully fixed double separator parsing bug

The parser now assumes spacing around the dashes between artists and track title
Also filter out "album mix" when parsing remixes

album mixes often are very similar to the original and create different entries on Last.fm
Quit using Ctrl+W and scrobble when pressing Return in password field
Merge branch 'master' into windows_binaries
rm cruft. add README.
Add D100 filter for /info/services end-point.

 - Update unit tests to suit this change.

Change-Id: I596a2b90bf316231655735d294cd74068fe4164a
Remove devananda's ssh key.

He hasn't logged in in quite some time, so remove his key to reduce
our exposure.  He's welcome back any time.

Change-Id: I1404cf6cd5d0a598a583580a16b39735b0d22087
Reviewed-on: https://review.openstack.org/13772
Reviewed-by: Devananda van der Veen <devananda.vdv@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Jenkins Jobify the openstack-qa jobs.

Jenkins jobify the openstack-qa jobs, qa-docs and
gate-openstack-qa-merge.

Change-Id: I21a38d3d30c0707260f33eb4eed30c75b74f66ec
Reviewed-on: https://review.openstack.org/13789
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Add jobs to publish gerritbot tarballs/to pypi.

Gerritbot should be installable via pip. To make this possible add
jobs to publish gerritbot tarballs and push gerritbot to pypi when tags
are added to gerritbot.

Change-Id: I5de346cd96a096809c9fe44d2117ebdb45a180c4
Reviewed-on: https://review.openstack.org/10910
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Add timestamps/ansicolor to alll non-maven jobs.

(Untested with maven.)

Change-Id: I5d66b15afad5d1d50be83d00b4f81a50ccd10f98
Reviewed-on: https://review.openstack.org/10921
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
Add openstack/requirements.

Change-Id: Ic1a244ab0c851f4dfa5e43c2a6ca5b03fc3b4216
Reviewed-on: https://review.openstack.org/10923
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: Monty Taylor <mordred@inaugust.com>
Tested-by: Jenkins
Revert "Fix tarball jobs"

Fixes 1005877. Also, an empty master file was put in refs/meta/openstack/release so that the old NOMILESTONE logic should work without weirdness now.

This reverts commit b838629877b12fa044ce237e003b9d81a88bc9d2 and
1bfc9b22fdd1b1a275e1ac7a4e773c9cb8f41ba7 - except for the builders.py change.

Change-Id: I03e02b54e8f13dccd71cc7ec5fdf5d77fa4f42c4
Add the script from common-bump-milestone.

It's a good script that does good things. Having it in VC seems friendly.

Change-Id: I221101f3012a4df416635399d24a0a2f6d9bcd99
Import pkg_resources before launchpadlib.

Fixes bug 1001664. It's a hack, but it's not an evil hack.

Change-Id: I6d09cdecc5cae64a21cefad81c75ed1c02c4801c
Add ulimit module.

A new module that provides a define to add a file to
/etc/security/limits.d for each limit line defined. This can be used
to limit the number of processes a user can have.

Change-Id: I7d1074ec85dbf3e212c0eccbe4e6e926b56f561c
Merge "Add ulimit module."
Universal turing machine done and tested with a simple ">" to ">123" machine (compiled by hand).  Starting to write compiler...
(NEW) Splash screen with PlayUp logo.
(NEW) Main Menu with a bitmap font.
Android GPS Data

Our Android GPS App which basically serves as input data for our demo
Refactoring : removed all string literals and put into StringRes.java, renamed some files, added comments to a few files
Gave characters  the ability to retrieve all effects associate with its sub classes.
Added all the views and updated the controllers for all the base models, possessions is still not implemented fully.
Reference search now uses a dynamic setup to render instance, currently working on a link option that will allow users to see a reference in more detail.
CFileReader completed
Replaced file routines with FileReader & FileWriter
Unworking project
COMP: Patch ITK to pass -fpic option to DCMTK configuration
Merge pull request #153 from Chaircrusher/ITK_fpic_patch

COMP: Patch ITK to pass -fpic option to DCMTK configuration
Skeleton code for Shark
fixed the example

helps if you at least git it formatted correctly :/
This is also a commit

:D
popular users limited to site users
added popular groups
added popular group tools
group dead vs alive
Merge branch 'master' of ssh://git@github.com/ColdTrick/advanced_statistics.git
added language keys for group stats
Slugify converts '&' to 'and'
o.c.diag.epics.pvtree: Handle occasional initial 'null' value.

Sometimes PVManager sends initial 'null', which was mistaken as THE
value. No 'unknown' alarm indicator for fields which are usually
constants and have no alarm.
Add link to http://bootswatch.com/
Adding greentext to the function
- Upgrading to Jackson 2.1.1
FlyingActor class
Merge branch 'master' of https://github.com/CurtisOfTheDark/ludumdare-dec
Only use the "am" command in /system/bin.

Change-Id: I1bbfb05a4dd7f797536e39a5cdc39824d52e6744
su: Remove usage of system properties

 * Nick Kralevich pointed out that we can't trust the property service
   for su because it relies on an environment variable- it can only be
   trusted when coming from init. This could lead to a possible security
   issue.
 * Gather the properties from the relevant files ourselves for the new
   access checking code.
 * Also remove prior usage of property_get in activity.cpp just to be safe.

Change-Id: I4e590b9089fc4d34cdb25d363da04270774674c0
Update notes for submitted changes

* Added myself as a contributor for Italian translation
Shrooms!
Merge pull request #1 from Eckankar/test

Shrooms! Shrooms are neat.
address is done! I think...
added script for parallel merging of OTU tables. this was initially developed by Daniel McDonald, and should be merged into QIIME. test code and data also included
updated header information in code
'fixed wrong indent on the os.system() command for the actual downloading...'
added parameter dict support to raw read
Changes to tracking and detection
remove_by_attrib
Favicon
Merge branch 'dev' of github.com:Folkloreatelier/Boomerang2012 into dev
delete .gitignore
delete bin/
fixing bug introduced in refactoring
various updates, according to documentation
Creeps can die now
Added an example!

Signed-off-by: PandaDragonThing <jacob@linuxrocket.net>
Allowed longer responses for SurveyResponses
Added import of User to API views
convert to slidy
Added the autonomous code and general comments
Not working Data-Layer
Change Metamodel Processor
Should work now
added merge functionality
Merge remote-tracking branch 'github/ORM'

Conflicts:
	pom.xml
	src/main/java/de/hofuniversity/iws/server/LoginServiceImpl.java
Merge branch 'RevertSessionManagment'

Conflicts:
	pom.xml
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.java
	src/main/java/de/hofuniversity/iws/server/LoginServiceImpl.java
Merge remote-tracking branch 'github/oath'

Conflicts:
	pom.xml
	src/main/java/de/hofuniversity/iws/client/Main.java
	src/main/java/de/hofuniversity/iws/client/PhysixLabInjector.java
	src/main/java/de/hofuniversity/iws/client/services/LoginService.java
	src/main/java/de/hofuniversity/iws/client/widgets/LoginPage.java
	src/main/java/de/hofuniversity/iws/client/widgets/SessionPage.ui.xml
	src/main/java/de/hofuniversity/iws/server/LoginServiceImpl.java
	src/main/java/de/hofuniversity/iws/server/OAuthCallbackServlet.java
	src/main/java/de/hofuniversity/iws/server/OAuthLogin.java
little fix
OAuth Providers
Merge remote-tracking branch 'github/master' into Session-Managment

Conflicts:
	pom.xml
	src/main/java/de/hofuniversity/iws/client/services/LoginService.java
	src/main/java/de/hofuniversity/iws/client/widgets/SessionPage.ui.xml
	src/main/java/de/hofuniversity/iws/server/LoginServiceImpl.java
	src/main/java/de/hofuniversity/iws/server/OAuthCallbackServlet.java
login ueberarbeitet
login ueberarbeitet
Merge branch 'oauth-provider' into Session-Managment

Conflicts:
	src/main/java/de/hofuniversity/iws/server/OAuthLogin.java
	src/main/java/de/hofuniversity/iws/server/oauth/OAuthCallbackServlet.java
	src/main/java/de/hofuniversity/iws/server/services/LoginServiceImpl.java
working on oauth dummy
final session managment
final session managment
final session managment
mozsocial addon: persistent login and other improvements
Agregue unos ignores

los agregue para que no rompa las bolas al hacer pull o fetch o
cualquier cosa jaajajja
to be edited
Merge branch 'master' of https://github.com/MatthewGilbert/kaggle-project
Merge branch 'master' of https://github.com/MatthewGilbert/kaggle-project
edits
merged localreg.py
Moved validate results off of the csv object and results them in the validate functions callback
Added comments
Added comments
Added comments
Remove index.jade
Updated readme
NSTextCheckingTypePhoneNumber is no longer added automatically on label creation
uncomment browser_responsivecomputedview.js
Add screenshot + adjust background color
Update README steps.
Fix Android >=3 with browser history.
Typo in README
Merge branch 'master' of https://github.com/Mulemister/GhettoAssTemplates
Nyt myös maaston voi nähdä
Improvement on spike on signals widget : selection and add spike
Initial commit fix-aliases script
alias convert script done
Fixed alias lines in posts
solution work 8 including testat